From d25a8f1d79fb276006e61971eb8efef965788a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 26 Oct 2023 15:15:30 +0200 Subject: [PATCH 1/4] Move sirius plugin. --- .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../OSGI-INF/l10n/bundle_en.properties | 0 .../build.properties | 0 .../chemclipse/msd/converter/supplier/sirius/ui/Activator.java | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/.classpath (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/.gitignore (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/.project (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/.settings/org.eclipse.core.resources.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/META-INF/MANIFEST.MF (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/OSGI-INF/l10n/bundle_en.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/build.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.msd.converter.supplier.sirius.ui => org.eclipse.chemclipse.msd.converter.supplier.sirus.ui}/src/org/eclipse/chemclipse/msd/converter/supplier/sirius/ui/Activator.java (100%) diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.classpath b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.classpath similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.classpath rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.classpath diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.gitignore b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.gitignore similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.gitignore rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.gitignore diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.project b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.project similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.project rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.project diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.settings/org.eclipse.core.resources.prefs b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.settings/org.eclipse.core.resources.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.settings/org.eclipse.core.resources.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.settings/org.eclipse.jdt.core.prefs b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/.settings/org.eclipse.jdt.core.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/META-INF/MANIFEST.MF b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/META-INF/MANIFEST.MF similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/META-INF/MANIFEST.MF rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/META-INF/MANIFEST.MF diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/OSGI-INF/l10n/bundle_en.properties b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/OSGI-INF/l10n/bundle_en.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/OSGI-INF/l10n/bundle_en.properties rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/OSGI-INF/l10n/bundle_en.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/build.properties b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/build.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/build.properties rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/build.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/src/org/eclipse/chemclipse/msd/converter/supplier/sirius/ui/Activator.java b/chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/src/org/eclipse/chemclipse/msd/converter/supplier/sirius/ui/Activator.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirius.ui/src/org/eclipse/chemclipse/msd/converter/supplier/sirius/ui/Activator.java rename to chemclipse/plugins/org.eclipse.chemclipse.msd.converter.supplier.sirus.ui/src/org/eclipse/chemclipse/msd/converter/supplier/sirius/ui/Activator.java From 326c7ddacfce7f049647924a4720b989a9bec6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 26 Oct 2023 15:16:28 +0200 Subject: [PATCH 2/4] Move PCR text plugin. --- .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../plugin.xml | 0 .../eclipse/chemclipse/pcr/report/supplier/txt/ui/Activator.java | 0 .../chemclipse/pcr/report/supplier/txt/ui/icon/MenuIcon.java | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/.classpath (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/.gitignore (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/.project (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/.settings/org.eclipse.core.resources.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/META-INF/MANIFEST.MF (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/build.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/plugin.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/Activator.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui => org.eclipse.chemclipse.pcr.report.supplier.txt.ui}/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/icon/MenuIcon.java (100%) diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.classpath b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.classpath similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.classpath rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.classpath diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.gitignore b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.gitignore similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.gitignore rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.gitignore diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.project b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.project similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.project rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.project diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.settings/org.eclipse.core.resources.prefs b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.settings/org.eclipse.core.resources.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.settings/org.eclipse.core.resources.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.settings/org.eclipse.jdt.core.prefs b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/.settings/org.eclipse.jdt.core.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/META-INF/MANIFEST.MF b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/META-INF/MANIFEST.MF similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/META-INF/MANIFEST.MF rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/META-INF/MANIFEST.MF diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/build.properties b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/build.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/build.properties rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/build.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/plugin.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/plugin.xml rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/plugin.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/Activator.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/Activator.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/Activator.java rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/Activator.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/icon/MenuIcon.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/icon/MenuIcon.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/icon/MenuIcon.java rename to chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.txt.ui/src/org/eclipse/chemclipse/pcr/report/supplier/txt/ui/icon/MenuIcon.java From 96fb9b97eac54cc92488e3a564130ce76a2fc058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 26 Oct 2023 15:17:26 +0200 Subject: [PATCH 3/4] Move peak filter. --- .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.pde.ds.annotations.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../OSGI-INF/l10n/bundle_en.properties | 0 ...e.chemclipse.xxd.filter.chromatogram.IntensityCutOffFilter.xml | 0 .../org.eclipse.chemclipse.xxd.filter.peaks.AreaFilter.xml | 0 .../org.eclipse.chemclipse.xxd.filter.peaks.AreaPercentFilter.xml | 0 .../org.eclipse.chemclipse.xxd.filter.peaks.AsymmetryFilter.xml | 0 ....eclipse.chemclipse.xxd.filter.peaks.ClassifiedPeaksFilter.xml | 0 ...lipse.chemclipse.xxd.filter.peaks.DeleteIntegrationsFilter.xml | 0 ...hemclipse.xxd.filter.peaks.DeletePeaksByQuantitationFilter.xml | 0 ...ipse.chemclipse.xxd.filter.peaks.DeletePeaksByTargetFilter.xml | 0 ...lipse.chemclipse.xxd.filter.peaks.DeletePeaksByTraceFilter.xml | 0 .../org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksFilter.xml | 0 ...clipse.xxd.filter.peaks.DeleteQuantitationReferencesFilter.xml | 0 ...ipse.chemclipse.xxd.filter.peaks.DeleteQuantitationsFilter.xml | 0 ....eclipse.chemclipse.xxd.filter.peaks.DeleteStandardsFilter.xml | 0 ...rg.eclipse.chemclipse.xxd.filter.peaks.DeleteTargetsFilter.xml | 0 ...rg.eclipse.chemclipse.xxd.filter.peaks.HighPassPeaksFilter.xml | 0 ...org.eclipse.chemclipse.xxd.filter.peaks.LowPassPeaksFilter.xml | 0 ...rg.eclipse.chemclipse.xxd.filter.peaks.MinimumTracesFilter.xml | 0 ...se.chemclipse.xxd.filter.peaks.PeakActiveForAnalysisFilter.xml | 0 .../org.eclipse.chemclipse.xxd.filter.peaks.ShapeFilter.xml | 0 ...clipse.chemclipse.xxd.filter.peaks.SignalToNoisePeakFilter.xml | 0 .../org.eclipse.chemclipse.xxd.filter.peaks.WidthFilter.xml | 0 ...rg.eclipse.chemclipse.xxd.filter.scans.DeleteTargetsFilter.xml | 0 .../build.properties | 0 .../plugin.xml | 0 .../src/org/eclipse/chemclipse/xxd/filter/Activator.java | 0 .../chemclipse/xxd/filter/chromatogram/IntensityCutOffFilter.java | 0 .../chromatogram/settings/IntensityCutOffFilterSettings.java | 0 .../xxd/filter/chromatogram/settings/IntensityOption.java | 0 .../eclipse/chemclipse/xxd/filter/peaks/AbstractPeakFilter.java | 0 .../src/org/eclipse/chemclipse/xxd/filter/peaks/AreaFilter.java | 0 .../eclipse/chemclipse/xxd/filter/peaks/AreaPercentFilter.java | 0 .../org/eclipse/chemclipse/xxd/filter/peaks/AsymmetryFilter.java | 0 .../chemclipse/xxd/filter/peaks/ClassifiedPeaksFilter.java | 0 .../chemclipse/xxd/filter/peaks/DeleteIntegrationsFilter.java | 0 .../xxd/filter/peaks/DeletePeaksByQuantitationFilter.java | 0 .../chemclipse/xxd/filter/peaks/DeletePeaksByTargetFilter.java | 0 .../chemclipse/xxd/filter/peaks/DeletePeaksByTraceFilter.java | 0 .../eclipse/chemclipse/xxd/filter/peaks/DeletePeaksFilter.java | 0 .../xxd/filter/peaks/DeleteQuantitationReferencesFilter.java | 0 .../chemclipse/xxd/filter/peaks/DeleteQuantitationsFilter.java | 0 .../chemclipse/xxd/filter/peaks/DeleteStandardsFilter.java | 0 .../eclipse/chemclipse/xxd/filter/peaks/DeleteTargetsFilter.java | 0 .../eclipse/chemclipse/xxd/filter/peaks/HighPassPeaksFilter.java | 0 .../eclipse/chemclipse/xxd/filter/peaks/LowPassPeaksFilter.java | 0 .../eclipse/chemclipse/xxd/filter/peaks/MinimumTracesFilter.java | 0 .../chemclipse/xxd/filter/peaks/PeakActiveForAnalysisFilter.java | 0 .../src/org/eclipse/chemclipse/xxd/filter/peaks/ShapeFilter.java | 0 .../chemclipse/xxd/filter/peaks/SignalToNoisePeakFilter.java | 0 .../src/org/eclipse/chemclipse/xxd/filter/peaks/WidthFilter.java | 0 .../org/eclipse/chemclipse/xxd/filter/peaks/XPassPeaksFilter.java | 0 .../xxd/filter/peaks/operations/DeletePeaksOperation.java | 0 .../chemclipse/xxd/filter/peaks/settings/AreaFilterSettings.java | 0 .../xxd/filter/peaks/settings/AreaPercentFilterSettings.java | 0 .../xxd/filter/peaks/settings/AsymmetryFilterSettings.java | 0 .../xxd/filter/peaks/settings/ClassifiedPeaksFilterSettings.java | 0 .../filter/peaks/settings/DeleteIntegrationsFilterSettings.java | 0 .../peaks/settings/DeletePeaksByQuantitationFilterSettings.java | 0 .../filter/peaks/settings/DeletePeaksByTargetFilterSettings.java | 0 .../filter/peaks/settings/DeletePeaksByTraceFilterSettings.java | 0 .../xxd/filter/peaks/settings/DeletePeaksFilterSettings.java | 0 .../settings/DeleteQuantitationReferencesFilterSettings.java | 0 .../filter/peaks/settings/DeleteQuantitationsFilterSettings.java | 0 .../xxd/filter/peaks/settings/DeleteStandardsFilterSettings.java | 0 .../xxd/filter/peaks/settings/HighPassPeaksFilterSettings.java | 0 .../xxd/filter/peaks/settings/LowPassPeaksFilterSettings.java | 0 .../xxd/filter/peaks/settings/MinimumTracesFilterSettings.java | 0 .../xxd/filter/peaks/settings/PeakActiveForAnalysisSettings.java | 0 .../chemclipse/xxd/filter/peaks/settings/PeakFilterOption.java | 0 .../chemclipse/xxd/filter/peaks/settings/ShapeFilterSettings.java | 0 .../filter/peaks/settings/SignalToNoisePeakFilterSettings.java | 0 .../chemclipse/xxd/filter/peaks/settings/WidthFilterSettings.java | 0 .../chemclipse/xxd/filter/preferences/PreferenceInitializer.java | 0 .../chemclipse/xxd/filter/preferences/PreferenceSupplier.java | 0 .../eclipse/chemclipse/xxd/filter/scans/DeleteTargetsFilter.java | 0 .../xxd/filter/settings/DeleteTargetsFilterSettings.java | 0 .../org/eclipse/chemclipse/xxd/filter/support/AreaCriterion.java | 0 .../eclipse/chemclipse/xxd/filter/support/AsymmetryCriterion.java | 0 .../eclipse/chemclipse/xxd/filter/support/PeaksDeleteOption.java | 0 .../org/eclipse/chemclipse/xxd/filter/support/ShapeCriterion.java | 0 .../chemclipse/xxd/filter/support/TargetsDeleteOption.java | 0 .../eclipse/chemclipse/xxd/filter/support/TreatmentOption.java | 0 .../org/eclipse/chemclipse/xxd/filter/support/WidthCriterion.java | 0 .../org/eclipse/chemclipse/xxd/filter/targets/TargetsFilter.java | 0 91 files changed, 0 insertions(+), 0 deletions(-) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/.classpath (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/.gitignore (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/.project (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/.settings/org.eclipse.core.resources.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/.settings/org.eclipse.jdt.core.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/.settings/org.eclipse.pde.ds.annotations.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/META-INF/MANIFEST.MF (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/l10n/bundle_en.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.chromatogram.IntensityCutOffFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaPercentFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AsymmetryFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ClassifiedPeaksFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteIntegrationsFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByQuantitationFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTargetFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTraceFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationReferencesFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationsFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteStandardsFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteTargetsFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.HighPassPeaksFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.LowPassPeaksFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.MinimumTracesFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.PeakActiveForAnalysisFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ShapeFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.SignalToNoisePeakFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.WidthFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/OSGI-INF/org.eclipse.chemclipse.xxd.filter.scans.DeleteTargetsFilter.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/build.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/plugin.xml (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/Activator.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/chromatogram/IntensityCutOffFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityCutOffFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityOption.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/AbstractPeakFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaPercentFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/AsymmetryFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/ClassifiedPeaksFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteIntegrationsFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByQuantitationFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTargetFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTraceFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationReferencesFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationsFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteStandardsFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteTargetsFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/HighPassPeaksFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/LowPassPeaksFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/MinimumTracesFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/PeakActiveForAnalysisFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/ShapeFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/SignalToNoisePeakFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/WidthFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/XPassPeaksFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/operations/DeletePeaksOperation.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaPercentFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AsymmetryFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ClassifiedPeaksFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteIntegrationsFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByQuantitationFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTargetFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTraceFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationReferencesFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationsFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteStandardsFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/HighPassPeaksFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/LowPassPeaksFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/MinimumTracesFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakActiveForAnalysisSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakFilterOption.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ShapeFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/SignalToNoisePeakFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/WidthFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceInitializer.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceSupplier.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/scans/DeleteTargetsFilter.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/settings/DeleteTargetsFilterSettings.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/support/AreaCriterion.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/support/AsymmetryCriterion.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/support/PeaksDeleteOption.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/support/ShapeCriterion.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/support/TargetsDeleteOption.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/support/TreatmentOption.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/support/WidthCriterion.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.peak.filter => org.eclipse.chemclipse.xxd.filter}/src/org/eclipse/chemclipse/xxd/filter/targets/TargetsFilter.java (100%) diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.classpath b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.classpath similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.classpath rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.classpath diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.gitignore b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.gitignore similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.gitignore rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.gitignore diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.project b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.project similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.project rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.project diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.settings/org.eclipse.core.resources.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.settings/org.eclipse.core.resources.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.settings/org.eclipse.core.resources.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.settings/org.eclipse.jdt.core.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.settings/org.eclipse.jdt.core.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.settings/org.eclipse.jdt.core.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.settings/org.eclipse.pde.ds.annotations.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.settings/org.eclipse.pde.ds.annotations.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/.settings/org.eclipse.pde.ds.annotations.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/.settings/org.eclipse.pde.ds.annotations.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/META-INF/MANIFEST.MF b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/META-INF/MANIFEST.MF similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/META-INF/MANIFEST.MF rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/META-INF/MANIFEST.MF diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/l10n/bundle_en.properties b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/l10n/bundle_en.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/l10n/bundle_en.properties rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/l10n/bundle_en.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.chromatogram.IntensityCutOffFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.chromatogram.IntensityCutOffFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.chromatogram.IntensityCutOffFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.chromatogram.IntensityCutOffFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaPercentFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaPercentFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaPercentFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AreaPercentFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AsymmetryFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AsymmetryFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AsymmetryFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.AsymmetryFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ClassifiedPeaksFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ClassifiedPeaksFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ClassifiedPeaksFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ClassifiedPeaksFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteIntegrationsFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteIntegrationsFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteIntegrationsFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteIntegrationsFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByQuantitationFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByQuantitationFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByQuantitationFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByQuantitationFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTargetFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTargetFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTargetFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTargetFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTraceFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTraceFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTraceFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksByTraceFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeletePeaksFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationReferencesFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationReferencesFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationReferencesFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationReferencesFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationsFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationsFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationsFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteQuantitationsFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteStandardsFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteStandardsFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteStandardsFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteStandardsFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteTargetsFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteTargetsFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteTargetsFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.DeleteTargetsFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.HighPassPeaksFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.HighPassPeaksFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.HighPassPeaksFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.HighPassPeaksFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.LowPassPeaksFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.LowPassPeaksFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.LowPassPeaksFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.LowPassPeaksFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.MinimumTracesFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.MinimumTracesFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.MinimumTracesFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.MinimumTracesFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.PeakActiveForAnalysisFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.PeakActiveForAnalysisFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.PeakActiveForAnalysisFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.PeakActiveForAnalysisFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ShapeFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ShapeFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ShapeFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.ShapeFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.SignalToNoisePeakFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.SignalToNoisePeakFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.SignalToNoisePeakFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.SignalToNoisePeakFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.WidthFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.WidthFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.WidthFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.peaks.WidthFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.scans.DeleteTargetsFilter.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.scans.DeleteTargetsFilter.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.scans.DeleteTargetsFilter.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/OSGI-INF/org.eclipse.chemclipse.xxd.filter.scans.DeleteTargetsFilter.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/build.properties b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/build.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/build.properties rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/build.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/plugin.xml similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/plugin.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/plugin.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/Activator.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/Activator.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/Activator.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/Activator.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/IntensityCutOffFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/IntensityCutOffFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/IntensityCutOffFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/IntensityCutOffFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityCutOffFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityCutOffFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityCutOffFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityCutOffFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityOption.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityOption.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityOption.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/chromatogram/settings/IntensityOption.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AbstractPeakFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AbstractPeakFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AbstractPeakFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AbstractPeakFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaPercentFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaPercentFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaPercentFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AreaPercentFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AsymmetryFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AsymmetryFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AsymmetryFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/AsymmetryFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ClassifiedPeaksFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ClassifiedPeaksFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ClassifiedPeaksFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ClassifiedPeaksFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteIntegrationsFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteIntegrationsFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteIntegrationsFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteIntegrationsFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByQuantitationFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByQuantitationFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByQuantitationFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByQuantitationFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTargetFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTargetFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTargetFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTargetFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTraceFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTraceFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTraceFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksByTraceFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeletePeaksFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationReferencesFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationReferencesFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationReferencesFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationReferencesFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationsFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationsFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationsFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteQuantitationsFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteStandardsFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteStandardsFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteStandardsFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteStandardsFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteTargetsFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteTargetsFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteTargetsFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/DeleteTargetsFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/HighPassPeaksFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/HighPassPeaksFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/HighPassPeaksFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/HighPassPeaksFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/LowPassPeaksFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/LowPassPeaksFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/LowPassPeaksFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/LowPassPeaksFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/MinimumTracesFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/MinimumTracesFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/MinimumTracesFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/MinimumTracesFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/PeakActiveForAnalysisFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/PeakActiveForAnalysisFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/PeakActiveForAnalysisFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/PeakActiveForAnalysisFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ShapeFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ShapeFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ShapeFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/ShapeFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/SignalToNoisePeakFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/SignalToNoisePeakFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/SignalToNoisePeakFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/SignalToNoisePeakFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/WidthFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/WidthFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/WidthFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/WidthFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/XPassPeaksFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/XPassPeaksFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/XPassPeaksFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/XPassPeaksFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/operations/DeletePeaksOperation.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/operations/DeletePeaksOperation.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/operations/DeletePeaksOperation.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/operations/DeletePeaksOperation.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaPercentFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaPercentFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaPercentFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AreaPercentFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AsymmetryFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AsymmetryFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AsymmetryFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/AsymmetryFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ClassifiedPeaksFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ClassifiedPeaksFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ClassifiedPeaksFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ClassifiedPeaksFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteIntegrationsFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteIntegrationsFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteIntegrationsFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteIntegrationsFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByQuantitationFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByQuantitationFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByQuantitationFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByQuantitationFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTargetFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTargetFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTargetFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTargetFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTraceFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTraceFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTraceFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksByTraceFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeletePeaksFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationReferencesFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationReferencesFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationReferencesFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationReferencesFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationsFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationsFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationsFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteQuantitationsFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteStandardsFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteStandardsFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteStandardsFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/DeleteStandardsFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/HighPassPeaksFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/HighPassPeaksFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/HighPassPeaksFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/HighPassPeaksFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/LowPassPeaksFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/LowPassPeaksFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/LowPassPeaksFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/LowPassPeaksFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/MinimumTracesFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/MinimumTracesFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/MinimumTracesFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/MinimumTracesFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakActiveForAnalysisSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakActiveForAnalysisSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakActiveForAnalysisSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakActiveForAnalysisSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakFilterOption.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakFilterOption.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakFilterOption.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/PeakFilterOption.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ShapeFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ShapeFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ShapeFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/ShapeFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/SignalToNoisePeakFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/SignalToNoisePeakFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/SignalToNoisePeakFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/SignalToNoisePeakFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/WidthFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/WidthFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/WidthFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/peaks/settings/WidthFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceInitializer.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceInitializer.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceInitializer.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceInitializer.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceSupplier.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceSupplier.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/preferences/PreferenceSupplier.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/scans/DeleteTargetsFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/scans/DeleteTargetsFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/scans/DeleteTargetsFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/scans/DeleteTargetsFilter.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/settings/DeleteTargetsFilterSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/settings/DeleteTargetsFilterSettings.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/settings/DeleteTargetsFilterSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/settings/DeleteTargetsFilterSettings.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/AreaCriterion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/AreaCriterion.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/AreaCriterion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/AreaCriterion.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/AsymmetryCriterion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/AsymmetryCriterion.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/AsymmetryCriterion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/AsymmetryCriterion.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/PeaksDeleteOption.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/PeaksDeleteOption.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/PeaksDeleteOption.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/PeaksDeleteOption.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/ShapeCriterion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/ShapeCriterion.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/ShapeCriterion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/ShapeCriterion.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/TargetsDeleteOption.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/TargetsDeleteOption.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/TargetsDeleteOption.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/TargetsDeleteOption.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/TreatmentOption.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/TreatmentOption.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/TreatmentOption.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/TreatmentOption.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/WidthCriterion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/WidthCriterion.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/support/WidthCriterion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/support/WidthCriterion.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/targets/TargetsFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/targets/TargetsFilter.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.peak.filter/src/org/eclipse/chemclipse/xxd/filter/targets/TargetsFilter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.filter/src/org/eclipse/chemclipse/xxd/filter/targets/TargetsFilter.java From d36d087ff6887b03c2a6f4b6247d66ca22906853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 26 Oct 2023 14:59:06 +0200 Subject: [PATCH 4/4] Rename supplier.chemclipse to supplier.ocx --- .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../build.properties | 0 .../feature.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../org.eclipse.pde.ds.annotations.prefs | 0 .../META-INF/MANIFEST.MF | 10 +-- .../OSGI-INF/l10n/bundle_en.properties | 0 ...ChromatogramFileExportProcessSupplier.xml} | 4 +- .../build.properties | 0 .../icons/16x16/chromatogram.gif | Bin .../icons/16x16/report.gif | Bin .../plugin.xml | 10 +-- .../converter/supplier/ocx}/ui/Activator.java | 4 +- .../ocx}/ui/preferences/PreferencePage.java | 4 +- .../ui/preferences/PreferencePageOCB.java | 8 +-- .../ui/preferences/PreferencePageOCM.java | 8 +-- .../ui/preferences/PreferencePageOCQ.java | 8 +-- .../ui/preferences/PreferencePageOCS.java | 4 +- ...ChromatogramFileExportProcessSupplier.java | 14 ++--- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../org.eclipse.pde.ds.annotations.prefs | 0 .../META-INF/MANIFEST.MF | 30 ++++----- .../OSGI-INF/l10n/bundle_en.properties | 0 ...er.supplier.ocx.ChromatogramProcedure.xml} | 4 +- ...r.ocx.system.ConverterProcessSupplier.xml} | 4 +- .../build.properties | 0 .../plugin.xml | 44 ++++++------- .../ChromatogramExportConverter.java | 8 +-- .../ChromatogramImportConverter.java | 8 +-- .../ocx}/converter/FileContentMatcherCSD.java | 4 +- .../ocx}/converter/MagicNumberMatcher.java | 4 +- .../io/AbstractChromatogramReader.java | 2 +- .../internal/io/ChromatogramReader_1001.java | 18 +++--- .../internal/io/ChromatogramReader_1002.java | 18 +++--- .../internal/io/ChromatogramReader_1003.java | 18 +++--- .../internal/io/ChromatogramReader_1004.java | 18 +++--- .../internal/io/ChromatogramReader_1005.java | 18 +++--- .../internal/io/ChromatogramReader_1006.java | 18 +++--- .../internal/io/ChromatogramReader_1007.java | 18 +++--- .../internal/io/ChromatogramReader_1100.java | 18 +++--- .../internal/io/ChromatogramReader_1300.java | 24 ++++---- .../internal/io/ChromatogramReader_1301.java | 24 ++++---- .../internal/io/ChromatogramReader_1400.java | 24 ++++---- .../internal/io/ChromatogramReader_1500.java | 24 ++++---- .../internal/io/ChromatogramWriter_1001.java | 8 +-- .../internal/io/ChromatogramWriter_1002.java | 8 +-- .../internal/io/ChromatogramWriter_1003.java | 8 +-- .../internal/io/ChromatogramWriter_1004.java | 8 +-- .../internal/io/ChromatogramWriter_1005.java | 8 +-- .../internal/io/ChromatogramWriter_1006.java | 10 +-- .../internal/io/ChromatogramWriter_1007.java | 10 +-- .../internal/io/ChromatogramWriter_1100.java | 10 +-- .../internal/io/ChromatogramWriter_1300.java | 16 ++--- .../internal/io/ChromatogramWriter_1301.java | 16 ++--- .../internal/io/ChromatogramWriter_1400.java | 16 ++--- .../internal/io/ChromatogramWriter_1500.java | 16 ++--- .../ocx}/io/ChromatogramReaderCSD.java | 40 ++++++------ .../ocx}/io/ChromatogramWriterCSD.java | 30 ++++----- .../ocx}/io/IChromatogramCSDZipReader.java | 2 +- .../ocx}/io/IChromatogramCSDZipWriter.java | 2 +- .../chromatogram/IVendorChromatogram.java | 2 +- .../ocx}/model/chromatogram/IVendorScan.java | 2 +- .../chromatogram/VendorChromatogram.java | 2 +- .../ocx}/model/chromatogram/VendorScan.java | 2 +- .../ChromatogramExportConverter.java | 8 +-- .../ChromatogramImportConverter.java | 8 +-- .../ocx}/converter/FileContentMatcherMSD.java | 4 +- .../ocx}/converter/PeakExportConverter.java | 2 +- .../ocx}/converter/PeakImportConverter.java | 8 +-- .../io/AbstractChromatogramReader.java | 4 +- .../ocx}/internal/io/AbstractZipReader.java | 2 +- .../internal/io/ChromatogramReader_0701.java | 22 +++---- .../internal/io/ChromatogramReader_0801.java | 18 +++--- .../internal/io/ChromatogramReader_0802.java | 18 +++--- .../internal/io/ChromatogramReader_0803.java | 22 +++---- .../internal/io/ChromatogramReader_0901.java | 22 +++---- .../internal/io/ChromatogramReader_0902.java | 22 +++---- .../internal/io/ChromatogramReader_0903.java | 22 +++---- .../internal/io/ChromatogramReader_1001.java | 22 +++---- .../internal/io/ChromatogramReader_1002.java | 22 +++---- .../internal/io/ChromatogramReader_1003.java | 30 ++++----- .../internal/io/ChromatogramReader_1004.java | 30 ++++----- .../internal/io/ChromatogramReader_1005.java | 30 ++++----- .../internal/io/ChromatogramReader_1006.java | 30 ++++----- .../internal/io/ChromatogramReader_1007.java | 30 ++++----- .../internal/io/ChromatogramReader_1100.java | 32 +++++----- .../internal/io/ChromatogramReader_1300.java | 36 +++++------ .../internal/io/ChromatogramReader_1301.java | 36 +++++------ .../internal/io/ChromatogramReader_1400.java | 36 +++++------ .../internal/io/ChromatogramReader_1500.java | 36 +++++------ .../internal/io/ChromatogramWriter_0701.java | 12 ++-- .../internal/io/ChromatogramWriter_0801.java | 8 +-- .../internal/io/ChromatogramWriter_0802.java | 8 +-- .../internal/io/ChromatogramWriter_0803.java | 8 +-- .../internal/io/ChromatogramWriter_0901.java | 8 +-- .../internal/io/ChromatogramWriter_0902.java | 8 +-- .../internal/io/ChromatogramWriter_0903.java | 8 +-- .../internal/io/ChromatogramWriter_1001.java | 8 +-- .../internal/io/ChromatogramWriter_1002.java | 8 +-- .../internal/io/ChromatogramWriter_1003.java | 12 ++-- .../internal/io/ChromatogramWriter_1004.java | 12 ++-- .../internal/io/ChromatogramWriter_1005.java | 12 ++-- .../internal/io/ChromatogramWriter_1006.java | 14 ++--- .../internal/io/ChromatogramWriter_1007.java | 14 ++--- .../internal/io/ChromatogramWriter_1100.java | 14 ++--- .../internal/io/ChromatogramWriter_1300.java | 20 +++--- .../internal/io/ChromatogramWriter_1301.java | 20 +++--- .../internal/io/ChromatogramWriter_1400.java | 20 +++--- .../internal/io/ChromatogramWriter_1500.java | 22 +++---- .../ocx}/internal/io/PeakReader_0701.java | 12 ++-- .../ocx}/internal/io/PeakReader_0801.java | 8 +-- .../ocx}/internal/io/PeakReader_0802.java | 8 +-- .../ocx}/internal/io/PeakReader_0803.java | 8 +-- .../ocx}/internal/io/PeakReader_0901.java | 8 +-- .../ocx}/internal/io/PeakReader_0902.java | 8 +-- .../ocx}/internal/io/PeakReader_0903.java | 8 +-- .../ocx}/internal/io/PeakReader_1001.java | 8 +-- .../ocx}/internal/io/PeakReader_1002.java | 8 +-- .../ocx}/internal/io/PeakReader_1003.java | 8 +-- .../ocx}/internal/io/PeakReader_1004.java | 8 +-- .../ocx}/internal/io/PeakReader_1005.java | 8 +-- .../ocx}/internal/io/PeakReader_1006.java | 8 +-- .../ocx}/internal/io/PeakReader_1007.java | 8 +-- .../ocx}/internal/io/PeakReader_1100.java | 8 +-- .../ocx}/internal/io/PeakReader_1300.java | 8 +-- .../ocx}/internal/io/PeakReader_1301.java | 8 +-- .../ocx}/internal/io/PeakReader_1400.java | 8 +-- .../ocx}/internal/io/PeakReader_1500.java | 8 +-- .../ocx}/internal/io/ReaderProxy_1003.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1004.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1005.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1006.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1007.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1100.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1300.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1301.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1400.java | 14 ++--- .../ocx}/internal/io/ReaderProxy_1500.java | 14 ++--- .../ocx}/io/ChromatogramReaderMSD.java | 58 +++++++++--------- .../ocx}/io/ChromatogramWriterMSD.java | 44 ++++++------- .../ocx}/io/IChromatogramMSDZipReader.java | 2 +- .../ocx}/io/IChromatogramMSDZipWriter.java | 2 +- .../supplier/ocx}/io/IReaderProxy.java | 6 +- .../supplier/ocx}/io/PeakReaderMSD.java | 44 ++++++------- .../supplier/ocx}/io/ProxyReaderMSD.java | 26 ++++---- .../chromatogram/IVendorChromatogram.java | 2 +- .../ocx}/model/chromatogram/IVendorIon.java | 2 +- .../ocx}/model/chromatogram/IVendorScan.java | 2 +- .../model/chromatogram/IVendorScanProxy.java | 2 +- .../chromatogram/VendorChromatogram.java | 2 +- .../ocx}/model/chromatogram/VendorIon.java | 2 +- .../ocx}/model/chromatogram/VendorScan.java | 2 +- .../model/chromatogram/VendorScanProxy.java | 4 +- .../ChromatogramExportConverter.java | 8 +-- .../ChromatogramImportConverter.java | 8 +-- .../ocx}/converter/FileContentMatcherWSD.java | 4 +- .../io/AbstractChromatogramReader.java | 2 +- .../internal/io/ChromatogramReader_1005.java | 18 +++--- .../internal/io/ChromatogramReader_1006.java | 18 +++--- .../internal/io/ChromatogramReader_1007.java | 18 +++--- .../internal/io/ChromatogramReader_1100.java | 18 +++--- .../internal/io/ChromatogramReader_1300.java | 26 ++++---- .../internal/io/ChromatogramReader_1301.java | 26 ++++---- .../internal/io/ChromatogramReader_1400.java | 26 ++++---- .../internal/io/ChromatogramReader_1500.java | 26 ++++---- .../internal/io/ChromatogramWriter_1005.java | 8 +-- .../internal/io/ChromatogramWriter_1006.java | 10 +-- .../internal/io/ChromatogramWriter_1007.java | 10 +-- .../internal/io/ChromatogramWriter_1100.java | 10 +-- .../internal/io/ChromatogramWriter_1300.java | 16 ++--- .../internal/io/ChromatogramWriter_1301.java | 16 ++--- .../internal/io/ChromatogramWriter_1400.java | 16 ++--- .../internal/io/ChromatogramWriter_1500.java | 16 ++--- .../ocx}/io/ChromatogramReaderWSD.java | 22 +++---- .../ocx}/io/ChromatogramWriterWSD.java | 22 +++---- .../ocx}/io/IChromatogramWSDZipReader.java | 2 +- .../ocx}/io/IChromatogramWSDZipWriter.java | 2 +- .../chromatogram/IVendorChromatogram.java | 2 +- .../ocx}/model/chromatogram/IVendorScan.java | 2 +- .../model/chromatogram/IVendorScanSignal.java | 2 +- .../chromatogram/VendorChromatogram.java | 2 +- .../ocx}/model/chromatogram/VendorScan.java | 2 +- .../model/chromatogram/VendorScanSignal.java | 2 +- .../io/exception/UnknownVersionException.java | 0 .../converter/supplier/ocx}/Activator.java | 2 +- .../supplier/ocx}/ChromatogramProcedure.java | 14 ++--- .../ocx}/ChromatogramProcedureSettings.java | 2 +- .../converter/supplier/ocx}/PathResolver.java | 2 +- .../ocx}/converter/MagicNumberMatcher.java | 4 +- .../methods/AbstractMethodReader.java | 4 +- .../methods/AbstractMethodWriter.java | 6 +- .../methods/GenericStreamMethodFormat.java | 2 +- .../ocx}/internal/methods/IMethodReader.java | 2 +- .../ocx}/internal/methods/IMethodWriter.java | 2 +- .../methods/MethodReaderWriter_1003.java | 4 +- .../methods/MethodReaderWriter_1004.java | 4 +- .../methods/MethodReaderWriter_1401.java | 4 +- .../internal/methods/MethodReader_1000.java | 4 +- .../internal/methods/MethodReader_1001.java | 4 +- .../internal/methods/MethodWriter_1000.java | 4 +- .../internal/methods/MethodWriter_1001.java | 4 +- .../methods/ObjectStreamMethodFormat.java | 2 +- .../quantitation/AbstractDatabaseReader.java | 2 +- .../quantitation/DatabaseReader_1000.java | 4 +- .../quantitation/DatabaseWriter_1000.java | 8 +-- .../quantitation/IDatabaseReader.java | 2 +- .../quantitation/IDatabaseWriter.java | 2 +- .../internal/support/BaselineElement.java | 2 +- .../internal/support/IBaselineElement.java | 2 +- .../ocx}/internal/support/IConstants.java | 2 +- .../ocx}/internal/support/IFormat.java | 2 +- .../ocx}/internal/support/IScanProxy.java | 2 +- .../internal/support/MassSpectrometer.java | 2 +- .../internal/support/MassSpectrumType.java | 2 +- .../ocx}/internal/support/ReaderHelper.java | 2 +- .../support/RetentionIndexTypeSupport.java | 2 +- .../ocx}/internal/support/ScanProxy.java | 2 +- .../support/SpecificationValidator.java | 2 +- .../ocx}/methods/FileContentMatcher.java | 2 +- .../ocx}/methods/MagicNumberMatcher.java | 2 +- .../ocx}/methods/MethodExportConverter.java | 18 +++--- .../ocx}/methods/MethodImportConverter.java | 14 ++--- .../preferences/PreferenceInitializer.java | 2 +- .../ocx}/preferences/PreferenceSupplier.java | 6 +- .../quantitation/DatabaseExportConverter.java | 6 +- .../quantitation/DatabaseImportConverter.java | 6 +- .../ocx}/quantitation/MagicNumberMatcher.java | 2 +- .../settings/ChromatogramExportSettings.java | 6 +- .../ocx}/system/ConverterProcessSettings.java | 8 +-- .../ocx}/system/ConverterProcessSupplier.java | 4 +- .../ocx}/versions/ChromatogramVersion.java | 4 +- .../ocx}/versions/IFormatVersion.java | 2 +- .../supplier/ocx}/versions/MethodVersion.java | 4 +- .../ocx}/versions/QuantDatabaseVersion.java | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 6 +- .../build.properties | 0 .../xxd/converter/supplier/ocx}/AllTests.java | 4 +- .../supplier/ocx}/MethodReaderTest.java | 6 +- .../supplier/ocx}/TestPathHelper.java | 2 +- .../RetentionIndexTypeSupport_1_Test.java | 4 +- .../io/ChromatogramReaderFIDTestCase.java | 2 +- .../io/ChromatogramReaderMSDTestCase.java | 2 +- .../io/ChromatogramReaderWSDTestCase.java | 2 +- .../ChromatogramReader_1_FID_1001_ITest.java | 6 +- .../ChromatogramReader_1_FID_1002_ITest.java | 6 +- .../ChromatogramReader_1_FID_1003_ITest.java | 6 +- .../ChromatogramReader_1_FID_1004_ITest.java | 6 +- .../ChromatogramReader_1_FID_1005_ITest.java | 6 +- .../ChromatogramReader_1_FID_1006_ITest.java | 6 +- .../ChromatogramReader_1_FID_1007_ITest.java | 6 +- .../ChromatogramReader_1_FID_1100_ITest.java | 6 +- .../ChromatogramReader_1_FID_1300_ITest.java | 6 +- .../ChromatogramReader_1_FID_1301_ITest.java | 6 +- .../ChromatogramReader_1_FID_1400_ITest.java | 6 +- .../ChromatogramReader_1_FID_1500_ITest.java | 6 +- .../ChromatogramReader_1_MSD_0701_ITest.java | 4 +- .../ChromatogramReader_1_MSD_0801_ITest.java | 4 +- .../ChromatogramReader_1_MSD_0802_ITest.java | 4 +- .../ChromatogramReader_1_MSD_0803_ITest.java | 4 +- .../ChromatogramReader_1_MSD_0901_ITest.java | 4 +- .../ChromatogramReader_1_MSD_0902_ITest.java | 4 +- .../ChromatogramReader_1_MSD_0903_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1001_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1002_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1003_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1004_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1005_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1006_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1007_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1100_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1300_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1301_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1400_ITest.java | 4 +- .../ChromatogramReader_1_MSD_1500_ITest.java | 4 +- .../ChromatogramReader_2_MSD_0701_ITest.java | 4 +- .../ChromatogramReader_2_MSD_0801_ITest.java | 4 +- .../ChromatogramReader_2_MSD_0802_ITest.java | 4 +- .../ChromatogramReader_2_MSD_0803_ITest.java | 4 +- .../ChromatogramReader_2_MSD_0901_ITest.java | 4 +- .../ChromatogramReader_2_MSD_0902_ITest.java | 4 +- .../ChromatogramReader_2_MSD_0903_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1001_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1002_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1003_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1004_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1005_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1006_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1007_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1100_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1300_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1301_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1400_ITest.java | 4 +- .../ChromatogramReader_2_MSD_1500_ITest.java | 4 +- .../ChromatogramReader_3_FID_1001_ITest.java | 4 +- .../ChromatogramReader_3_FID_1002_ITest.java | 4 +- .../ChromatogramReader_3_FID_1003_ITest.java | 4 +- .../ChromatogramReader_3_FID_1004_ITest.java | 4 +- .../ChromatogramReader_3_FID_1005_ITest.java | 4 +- .../ChromatogramReader_3_FID_1006_ITest.java | 4 +- .../ChromatogramReader_3_FID_1007_ITest.java | 4 +- .../ChromatogramReader_3_FID_1100_ITest.java | 4 +- .../ChromatogramReader_3_FID_1300_ITest.java | 4 +- .../ChromatogramReader_3_FID_1301_ITest.java | 4 +- .../ChromatogramReader_3_FID_1400_ITest.java | 4 +- .../ChromatogramReader_3_FID_1500_ITest.java | 4 +- .../ChromatogramReader_3_MSD_1001_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1002_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1003_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1004_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1005_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1006_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1007_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1100_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1300_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1301_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1400_ITest.java | 6 +- .../ChromatogramReader_3_MSD_1500_ITest.java | 6 +- .../ocx}/io/PeakReaderMSDTestCase.java | 2 +- .../ocx}/io/PeakReader_1_MSD_0801_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_0802_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_0803_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_0901_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_0902_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_0903_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1001_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1002_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1003_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1004_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1005_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1006_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1007_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1100_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1300_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1301_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1400_ITest.java | 4 +- .../ocx}/io/PeakReader_1_MSD_1500_ITest.java | 4 +- .../testData/files/export/INFO.txt | 0 .../files/import/Chromatogram1-0701.ocb | Bin .../files/import/Chromatogram1-0801.ocb | Bin .../files/import/Chromatogram1-0802.ocb | Bin .../files/import/Chromatogram1-0803.ocb | Bin .../files/import/Chromatogram1-0901.ocb | Bin .../files/import/Chromatogram1-0902.ocb | Bin .../files/import/Chromatogram1-0903.ocb | Bin .../files/import/Chromatogram1-1001.ocb | Bin .../files/import/Chromatogram1-1002.ocb | Bin .../files/import/Chromatogram1-1003.ocb | Bin .../files/import/Chromatogram1-1004.ocb | Bin .../files/import/Chromatogram1-1005.ocb | Bin .../files/import/Chromatogram1-1006.ocb | Bin .../files/import/Chromatogram1-1007.ocb | Bin .../files/import/Chromatogram1-1100.ocb | Bin .../files/import/Chromatogram1-1300.ocb | Bin .../files/import/Chromatogram1-1301.ocb | Bin .../files/import/Chromatogram1-1400.ocb | Bin .../files/import/Chromatogram1-1500.ocb | Bin .../files/import/Chromatogram2-0701.ocb | Bin .../files/import/Chromatogram2-0801.ocb | Bin .../files/import/Chromatogram2-0802.ocb | Bin .../files/import/Chromatogram2-0803.ocb | Bin .../files/import/Chromatogram2-0901.ocb | Bin .../files/import/Chromatogram2-0902.ocb | Bin .../files/import/Chromatogram2-0903.ocb | Bin .../files/import/Chromatogram2-1001.ocb | Bin .../files/import/Chromatogram2-1002.ocb | Bin .../files/import/Chromatogram2-1003.ocb | Bin .../files/import/Chromatogram2-1004.ocb | Bin .../files/import/Chromatogram2-1005.ocb | Bin .../files/import/Chromatogram2-1006.ocb | Bin .../files/import/Chromatogram2-1007.ocb | Bin .../files/import/Chromatogram2-1100.ocb | Bin .../files/import/Chromatogram2-1300.ocb | Bin .../files/import/Chromatogram2-1301.ocb | Bin .../files/import/Chromatogram2-1400.ocb | Bin .../files/import/Chromatogram2-1500.ocb | Bin .../files/import/Chromatogram3-1001.ocb | Bin .../files/import/Chromatogram3-1002.ocb | Bin .../files/import/Chromatogram3-1003.ocb | Bin .../files/import/Chromatogram3-1004.ocb | Bin .../files/import/Chromatogram3-1005.ocb | Bin .../files/import/Chromatogram3-1006.ocb | Bin .../files/import/Chromatogram3-1007.ocb | Bin .../files/import/Chromatogram3-1100.ocb | Bin .../files/import/Chromatogram3-1300.ocb | Bin .../files/import/Chromatogram3-1301.ocb | Bin .../files/import/Chromatogram3-1400.ocb | Bin .../files/import/Chromatogram3-1500.ocb | Bin .../files/methods/ChromIdentMethod.ocm | Bin .../testData/files/methods/Format_v0.0.1.ocm | Bin .../testData/files/methods/Format_v0.0.2.ocm | Bin .../testData/files/methods/Format_v0.0.3.ocm | Bin 421 files changed, 1486 insertions(+), 1486 deletions(-) rename chemclipse/features/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature => org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature}/.project (81%) rename chemclipse/features/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature => org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature}/.settings/org.eclipse.core.resources.prefs (100%) rename chemclipse/features/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature => org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature}/build.properties (100%) rename chemclipse/features/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature => org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature}/feature.xml (86%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/.classpath (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/.gitignore (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/.project (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/.settings/org.eclipse.core.resources.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/.settings/org.eclipse.pde.ds.annotations.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/META-INF/MANIFEST.MF (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/OSGI-INF/l10n/bundle_en.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier.xml => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier.xml} (61%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/build.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/icons/16x16/chromatogram.gif (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/icons/16x16/report.gif (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui}/plugin.xml (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ui/Activator.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ui/preferences/PreferencePage.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ui/preferences/PreferencePageOCB.java (85%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ui/preferences/PreferencePageOCM.java (84%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ui/preferences/PreferencePageOCQ.java (84%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ui/preferences/PreferencePageOCS.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ui/processors/ChromatogramFileExportProcessSupplier.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/.classpath (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/.gitignore (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/.project (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/.settings/org.eclipse.core.resources.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/.settings/org.eclipse.jdt.core.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/.settings/org.eclipse.pde.ds.annotations.prefs (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/META-INF/MANIFEST.MF (62%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/OSGI-INF/l10n/bundle_en.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure.xml => org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure.xml} (69%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier.xml => org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier.xml} (66%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/build.properties (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/plugin.xml (77%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/converter/ChromatogramExportConverter.java (85%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/converter/ChromatogramImportConverter.java (87%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/converter/FileContentMatcherCSD.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/converter/MagicNumberMatcher.java (84%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/AbstractChromatogramReader.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1001.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1002.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1003.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1004.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1005.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1006.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1007.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1100.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1300.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1301.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1400.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramReader_1500.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1001.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1002.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1003.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1004.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1005.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1006.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1007.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1100.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1300.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1301.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1400.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1500.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/io/ChromatogramReaderCSD.java (79%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/io/ChromatogramWriterCSD.java (71%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/io/IChromatogramCSDZipReader.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/io/IChromatogramCSDZipWriter.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/model/chromatogram/IVendorChromatogram.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/model/chromatogram/IVendorScan.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/model/chromatogram/VendorChromatogram.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx}/model/chromatogram/VendorScan.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/converter/ChromatogramExportConverter.java (85%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/converter/ChromatogramImportConverter.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/converter/FileContentMatcherMSD.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/converter/PeakExportConverter.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/converter/PeakImportConverter.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/AbstractChromatogramReader.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/AbstractZipReader.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_0701.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_0801.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_0802.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_0803.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_0901.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_0902.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_0903.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1001.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1002.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1003.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1004.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1005.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1006.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1007.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1100.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1300.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1301.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1400.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramReader_1500.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_0701.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_0801.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_0802.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_0803.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_0901.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_0902.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_0903.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1001.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1002.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1003.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1004.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1005.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1006.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1007.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1100.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1300.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1301.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1400.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1500.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_0701.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_0801.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_0802.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_0803.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_0901.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_0902.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_0903.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1001.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1002.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1003.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1004.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1005.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1006.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1007.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1100.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1300.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1301.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1400.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/PeakReader_1500.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1003.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1004.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1005.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1006.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1007.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1100.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1300.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1301.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1400.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/internal/io/ReaderProxy_1500.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/io/ChromatogramReaderMSD.java (77%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/io/ChromatogramWriterMSD.java (68%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/io/IChromatogramMSDZipReader.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/io/IChromatogramMSDZipWriter.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/io/IReaderProxy.java (84%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/io/PeakReaderMSD.java (64%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/io/ProxyReaderMSD.java (64%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/IVendorChromatogram.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/IVendorIon.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/IVendorScan.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/IVendorScanProxy.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/VendorChromatogram.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/VendorIon.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/VendorScan.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx}/model/chromatogram/VendorScanProxy.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/converter/ChromatogramExportConverter.java (85%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/converter/ChromatogramImportConverter.java (87%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/converter/FileContentMatcherWSD.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/AbstractChromatogramReader.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1005.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1006.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1007.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1100.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1300.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1301.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1400.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramReader_1500.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1005.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1006.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1007.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1100.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1300.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1301.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1400.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/internal/io/ChromatogramWriter_1500.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/io/ChromatogramReaderWSD.java (82%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/io/ChromatogramWriterWSD.java (75%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/io/IChromatogramWSDZipReader.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/io/IChromatogramWSDZipWriter.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/model/chromatogram/IVendorChromatogram.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/model/chromatogram/IVendorScan.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/model/chromatogram/IVendorScanSignal.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/model/chromatogram/VendorChromatogram.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/model/chromatogram/VendorScan.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx}/model/chromatogram/VendorScanSignal.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx}/src/org/eclipse/chemclipse/xxd/converter/supplier/io/exception/UnknownVersionException.java (100%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/Activator.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ChromatogramProcedure.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/ChromatogramProcedureSettings.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/PathResolver.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/converter/MagicNumberMatcher.java (85%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/AbstractMethodReader.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/AbstractMethodWriter.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/GenericStreamMethodFormat.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/IMethodReader.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/IMethodWriter.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/MethodReaderWriter_1003.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/MethodReaderWriter_1004.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/MethodReaderWriter_1401.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/MethodReader_1000.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/MethodReader_1001.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/MethodWriter_1000.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/MethodWriter_1001.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/methods/ObjectStreamMethodFormat.java (98%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/quantitation/AbstractDatabaseReader.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/quantitation/DatabaseReader_1000.java (99%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/quantitation/DatabaseWriter_1000.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/quantitation/IDatabaseReader.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/quantitation/IDatabaseWriter.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/BaselineElement.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/IBaselineElement.java (88%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/IConstants.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/IFormat.java (99%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/IScanProxy.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/MassSpectrometer.java (87%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/MassSpectrumType.java (87%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/ReaderHelper.java (97%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/RetentionIndexTypeSupport.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/ScanProxy.java (95%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/SpecificationValidator.java (94%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/methods/FileContentMatcher.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/methods/MagicNumberMatcher.java (92%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/methods/MethodExportConverter.java (71%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/methods/MethodImportConverter.java (80%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/preferences/PreferenceInitializer.java (90%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/preferences/PreferenceSupplier.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/quantitation/DatabaseExportConverter.java (86%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/quantitation/DatabaseImportConverter.java (86%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/quantitation/MagicNumberMatcher.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/settings/ChromatogramExportSettings.java (87%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/system/ConverterProcessSettings.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/system/ConverterProcessSupplier.java (93%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/versions/ChromatogramVersion.java (91%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/versions/IFormatVersion.java (96%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/versions/MethodVersion.java (89%) rename chemclipse/plugins/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/versions/QuantDatabaseVersion.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/.classpath (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/.gitignore (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/.project (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/.settings/org.eclipse.core.resources.prefs (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/.settings/org.eclipse.jdt.core.prefs (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/META-INF/MANIFEST.MF (73%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/build.properties (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/AllTests.java (91%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/MethodReaderTest.java (95%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/TestPathHelper.java (99%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/internal/support/RetentionIndexTypeSupport_1_Test.java (91%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReaderFIDTestCase.java (96%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReaderMSDTestCase.java (96%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReaderWSDTestCase.java (96%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1001_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1002_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1003_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1004_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1005_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1006_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1007_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1100_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1300_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1301_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1400_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_FID_1500_ITest.java (87%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_0701_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_0801_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_0802_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_0803_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_0901_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_0902_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_0903_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1001_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1002_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1003_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1004_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1005_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1006_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1007_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1100_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1300_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1301_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1400_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_1_MSD_1500_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_0701_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_0801_ITest.java (97%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_0802_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_0803_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_0901_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_0902_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_0903_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1001_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1002_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1003_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1004_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1005_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1006_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1007_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1100_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1300_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1301_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1400_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_2_MSD_1500_ITest.java (98%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1001_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1002_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1003_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1004_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1005_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1006_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1007_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1100_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1300_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1301_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1400_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_FID_1500_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1001_ITest.java (91%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1002_ITest.java (91%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1003_ITest.java (91%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1004_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1005_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1006_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1007_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1100_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1300_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1301_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1400_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/ChromatogramReader_3_MSD_1500_ITest.java (92%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReaderMSDTestCase.java (96%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_0801_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_0802_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_0803_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_0901_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_0902_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_0903_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1001_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1002_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1003_ITest.java (93%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1004_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1005_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1006_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1007_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1100_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1300_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1301_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1400_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx}/io/PeakReader_1_MSD_1500_ITest.java (94%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/export/INFO.txt (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-0701.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-0801.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-0802.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-0803.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-0901.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-0902.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-0903.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1001.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1002.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1003.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1004.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1005.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1006.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1007.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1100.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1300.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1301.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1400.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram1-1500.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-0701.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-0801.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-0802.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-0803.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-0901.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-0902.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-0903.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1001.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1002.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1003.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1004.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1005.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1006.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1007.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1100.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1300.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1301.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1400.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram2-1500.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1001.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1002.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1003.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1004.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1005.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1006.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1007.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1100.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1300.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1301.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1400.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/import/Chromatogram3-1500.ocb (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/methods/ChromIdentMethod.ocm (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/methods/Format_v0.0.1.ocm (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/methods/Format_v0.0.2.ocm (100%) rename chemclipse/tests/{org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test => org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test}/testData/files/methods/Format_v0.0.3.ocm (100%) diff --git a/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/.project b/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/.project similarity index 81% rename from chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/.project rename to chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/.project index 03aaa01481..b700aea89e 100644 --- a/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/.project +++ b/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature + org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature diff --git a/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/.settings/org.eclipse.core.resources.prefs b/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/.settings/org.eclipse.core.resources.prefs rename to chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/.settings/org.eclipse.core.resources.prefs diff --git a/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/build.properties b/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/build.properties similarity index 100% rename from chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/build.properties rename to chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/build.properties diff --git a/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/feature.xml b/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/feature.xml similarity index 86% rename from chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/feature.xml rename to chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/feature.xml index 5d2cd368f5..a847a7dcdc 100644 --- a/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature/feature.xml +++ b/chemclipse/features/org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature/feature.xml @@ -20,14 +20,14 @@ - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse + org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.settings/org.eclipse.core.resources.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.settings/org.eclipse.core.resources.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/.settings/org.eclipse.core.resources.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.settings/org.eclipse.jdt.core.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.settings/org.eclipse.jdt.core.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.settings/org.eclipse.pde.ds.annotations.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/.settings/org.eclipse.pde.ds.annotations.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.settings/org.eclipse.pde.ds.annotations.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/.settings/org.eclipse.pde.ds.annotations.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/META-INF/MANIFEST.MF b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/META-INF/MANIFEST.MF similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/META-INF/MANIFEST.MF rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/META-INF/MANIFEST.MF index cdd5f2947f..594de744e6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/META-INF/MANIFEST.MF +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui +Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui Bundle-ManifestVersion: 2 Bundle-Name: Open Chromatography Binary UI -Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator +Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.8.0", + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.8.0", org.eclipse.chemclipse.support;bundle-version="0.8.0", org.eclipse.chemclipse.support.ui;bundle-version="0.8.0", org.eclipse.ui.forms;bundle-version="3.6.200", @@ -34,4 +34,4 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: ChemClipse -Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier.xml +Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/OSGI-INF/l10n/bundle_en.properties b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/OSGI-INF/l10n/bundle_en.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/OSGI-INF/l10n/bundle_en.properties rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/OSGI-INF/l10n/bundle_en.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier.xml similarity index 61% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier.xml index 44ebca5340..8cbbd06a69 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/build.properties b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/build.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/build.properties rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/build.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/icons/16x16/chromatogram.gif b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/icons/16x16/chromatogram.gif similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/icons/16x16/chromatogram.gif rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/icons/16x16/chromatogram.gif diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/icons/16x16/report.gif b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/icons/16x16/report.gif similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/icons/16x16/report.gif rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/icons/16x16/report.gif diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/plugin.xml similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/plugin.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/plugin.xml index b82f3cd861..e9f08b842b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/plugin.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/plugin.xml @@ -5,31 +5,31 @@ point="org.eclipse.ui.preferencePages"> diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/Activator.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/Activator.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/Activator.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/Activator.java index 2ce9e6b1c4..002568401e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/Activator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/Activator.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui; import org.osgi.framework.BundleContext; import org.eclipse.chemclipse.support.ui.activator.AbstractActivatorUI; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class Activator extends AbstractActivatorUI { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePage.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePage.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePage.java index 98b674e1f5..4f88a4d97d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePage.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePage.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences; import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.LabelFieldEditor; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCB.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCB.java similarity index 85% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCB.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCB.java index 9a491981cc..77091b85c4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCB.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCB.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences; import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpacerFieldEditor; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.ChromatogramVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.ChromatogramVersion; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.ScaleFieldEditor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCM.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCM.java similarity index 84% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCM.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCM.java index c676e1e731..8008d7aa48 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCM.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCM.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences; import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.MethodVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.MethodVersion; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCQ.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCQ.java similarity index 84% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCQ.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCQ.java index d29375c31b..bf7d28feb4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCQ.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCQ.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences; import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.QuantDatabaseVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.QuantDatabaseVersion; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCS.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCS.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCS.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCS.java index 28a409f26e..cb41d59bb7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/preferences/PreferencePageOCS.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/preferences/PreferencePageOCS.java @@ -9,9 +9,9 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/processors/ChromatogramFileExportProcessSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/processors/ChromatogramFileExportProcessSupplier.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/processors/ChromatogramFileExportProcessSupplier.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/processors/ChromatogramFileExportProcessSupplier.java index de8ac54d5c..60da28675b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ui/processors/ChromatogramFileExportProcessSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ui/processors/ChromatogramFileExportProcessSupplier.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors; import java.io.File; import java.util.Collection; @@ -17,14 +17,14 @@ import java.util.concurrent.Callable; import org.eclipse.chemclipse.csd.converter.io.IChromatogramCSDWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.core.IChromatogram; import org.eclipse.chemclipse.model.selection.IChromatogramSelection; import org.eclipse.chemclipse.model.supplier.IChromatogramSelectionProcessSupplier; import org.eclipse.chemclipse.msd.converter.io.IChromatogramMSDWriter; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.DataCategory; import org.eclipse.chemclipse.processing.core.ICategories; @@ -35,11 +35,11 @@ import org.eclipse.chemclipse.support.ui.files.ExtendedFileDialog; import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils; import org.eclipse.chemclipse.wsd.converter.io.IChromatogramWSDWriter; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.settings.ChromatogramExportSettings; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.IFormatVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.settings.ChromatogramExportSettings; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.IFormatVersion; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.classpath b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.classpath similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.classpath rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.classpath diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.gitignore b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.gitignore similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.gitignore rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.gitignore diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.project b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.project similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.project rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.project index f91d2b6d17..8b7e8ebc1e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui/.project +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.project @@ -1,6 +1,6 @@ - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui + org.eclipse.chemclipse.xxd.converter.supplier.ocx diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.settings/org.eclipse.core.resources.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.settings/org.eclipse.core.resources.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.settings/org.eclipse.core.resources.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.settings/org.eclipse.jdt.core.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.settings/org.eclipse.jdt.core.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.settings/org.eclipse.jdt.core.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.settings/org.eclipse.pde.ds.annotations.prefs b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.settings/org.eclipse.pde.ds.annotations.prefs similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/.settings/org.eclipse.pde.ds.annotations.prefs rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/.settings/org.eclipse.pde.ds.annotations.prefs diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/META-INF/MANIFEST.MF b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/META-INF/MANIFEST.MF similarity index 62% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/META-INF/MANIFEST.MF rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/META-INF/MANIFEST.MF index bd78338e45..acb062313a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/META-INF/MANIFEST.MF +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse +Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.ocx Eclipse-RegisterBuddy: org.eclipse.chemclipse.model, org.eclipse.chemclipse.msd.model Bundle-ManifestVersion: 2 Bundle-Name: Open Chromatography Binary -Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;singleton:=true +Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.ocx;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.Activator +Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.ocx.Activator Bundle-Vendor: ChemClipse Require-Bundle: org.eclipse.core.runtime, org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", @@ -24,16 +24,16 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.chemclipse.xxd.model;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter, - org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io, - org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter, - org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io, - org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.converter, - org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io, - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences, - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.settings, - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions, - org.eclipse.chemclipse.xxd.converter.supplier.io.exception +Export-Package: org.eclipse.chemclipse.csd.converter.supplier.ocx.converter, + org.eclipse.chemclipse.csd.converter.supplier.ocx.io, + org.eclipse.chemclipse.msd.converter.supplier.ocx.converter, + org.eclipse.chemclipse.msd.converter.supplier.ocx.io, + org.eclipse.chemclipse.wsd.converter.supplier.ocx.converter, + org.eclipse.chemclipse.wsd.converter.supplier.ocx.io, + org.eclipse.chemclipse.xxd.converter.supplier.io.exception, + org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences, + org.eclipse.chemclipse.xxd.converter.supplier.ocx.settings, + org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions Import-Package: org.osgi.service.component.annotations;version="1.2.0" -Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure.xml, - OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier.xml +Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure.xml, + OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier.xml diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/l10n/bundle_en.properties b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/l10n/bundle_en.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/l10n/bundle_en.properties rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/l10n/bundle_en.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure.xml similarity index 69% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure.xml index 831a08206c..4987eb8f3f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier.xml similarity index 66% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier.xml index 6da8051b74..9da649d38a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/build.properties b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/build.properties similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/build.properties rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/build.properties diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/plugin.xml similarity index 77% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/plugin.xml rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/plugin.xml index 3bc78a0d4d..949a6dc916 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/plugin.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/plugin.xml @@ -5,13 +5,13 @@ point="org.eclipse.chemclipse.msd.converter.chromatogramSupplier"> @@ -20,11 +20,11 @@ point="org.eclipse.chemclipse.msd.converter.peakSupplier"> @@ -33,13 +33,13 @@ point="org.eclipse.chemclipse.csd.converter.chromatogramSupplier"> @@ -47,20 +47,20 @@ + class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceInitializer"> @@ -69,13 +69,13 @@ point="org.eclipse.chemclipse.converter.processMethodSupplier"> @@ -84,12 +84,12 @@ point="org.eclipse.chemclipse.converter.quantitationDatabaseSupplier"> diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/ChromatogramExportConverter.java similarity index 85% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/ChromatogramExportConverter.java index bd99173c17..2fa9a98b2b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/ChromatogramExportConverter.java @@ -9,21 +9,21 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.converter; import java.io.File; import org.eclipse.chemclipse.converter.chromatogram.AbstractChromatogramExportConverter; import org.eclipse.chemclipse.converter.chromatogram.IChromatogramExportConverter; import org.eclipse.chemclipse.csd.converter.io.IChromatogramCSDWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.core.IChromatogram; import org.eclipse.chemclipse.model.core.IPeak; import org.eclipse.chemclipse.processing.core.IProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.SpecificationValidator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.SpecificationValidator; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramExportConverter extends AbstractChromatogramExportConverter implements IChromatogramExportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/ChromatogramImportConverter.java similarity index 87% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/ChromatogramImportConverter.java index 9ad3b3f58b..3f044cc45e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/ChromatogramImportConverter.java @@ -9,19 +9,19 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.converter; import java.io.File; import org.eclipse.chemclipse.converter.chromatogram.AbstractChromatogramImportConverter; import org.eclipse.chemclipse.csd.converter.io.IChromatogramCSDReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.processing.core.IProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.SpecificationValidator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.SpecificationValidator; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramImportConverter extends AbstractChromatogramImportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/FileContentMatcherCSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/FileContentMatcherCSD.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/FileContentMatcherCSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/FileContentMatcherCSD.java index 0ddbe05b7d..71ce877774 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/FileContentMatcherCSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/FileContentMatcherCSD.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.converter; import java.io.File; import java.util.Enumeration; @@ -18,7 +18,7 @@ import org.eclipse.chemclipse.converter.core.AbstractFileContentMatcher; import org.eclipse.chemclipse.converter.core.IFileContentMatcher; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public class FileContentMatcherCSD extends AbstractFileContentMatcher implements IFileContentMatcher { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/MagicNumberMatcher.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/MagicNumberMatcher.java similarity index 84% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/MagicNumberMatcher.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/MagicNumberMatcher.java index e4ac40c6b8..10f0647ecc 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/converter/MagicNumberMatcher.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/converter/MagicNumberMatcher.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.converter; import java.io.File; import org.eclipse.chemclipse.converter.core.AbstractMagicNumberMatcher; import org.eclipse.chemclipse.converter.core.IMagicNumberMatcher; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.IFormatVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.IFormatVersion; public class MagicNumberMatcher extends AbstractMagicNumberMatcher implements IMagicNumberMatcher { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java index e218a82e71..c67adc3887 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedInputStream; import java.io.DataInputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1001.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1001.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1001.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1001.java index 5c0cce12fd..4f854910ed 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1001.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1001.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -41,9 +41,9 @@ import org.eclipse.chemclipse.model.exceptions.PeakException; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1002.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1002.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1002.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1002.java index 87381ef2d4..fd0c836143 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1002.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1002.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -41,9 +41,9 @@ import org.eclipse.chemclipse.model.exceptions.PeakException; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1003.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1003.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1003.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1003.java index 5960959305..f7e7d75667 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1003.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1003.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -41,9 +41,9 @@ import org.eclipse.chemclipse.model.exceptions.PeakException; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1004.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1004.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1004.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1004.java index 265d0f9696..0c84c46abb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1004.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1004.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -41,9 +41,9 @@ import org.eclipse.chemclipse.model.exceptions.PeakException; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java index 70ee05ff06..128873f4d8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -42,9 +42,9 @@ import org.eclipse.chemclipse.model.exceptions.PeakException; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java index 5686b4a848..186ee439f6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -44,9 +44,9 @@ import org.eclipse.chemclipse.model.exceptions.PeakException; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java index 9ae93b38f4..a5a27e21b8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -44,9 +44,9 @@ import org.eclipse.chemclipse.model.exceptions.PeakException; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java index 3afc02c1a1..afe2d4a977 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -22,11 +22,11 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakModelCSD; @@ -46,9 +46,9 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java index 99d846ca05..6c35fa896a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -26,12 +26,12 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -73,16 +73,16 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java index a962158f46..b1e809310b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -27,12 +27,12 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -74,16 +74,16 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java index 02058218e2..bb95d18c3b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,12 +29,12 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -78,16 +78,16 @@ import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; import org.eclipse.chemclipse.model.targets.LibraryField; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java index d4cdae12a3..e1d6529bd3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,12 +29,12 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipReader; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -78,16 +78,16 @@ import org.eclipse.chemclipse.model.quantitation.QuantitationFlag; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; import org.eclipse.chemclipse.model.targets.LibraryField; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1001.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1001.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1001.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1001.java index 111711db25..d14c8ba2e8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1001.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1001.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -23,7 +23,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -32,8 +32,8 @@ import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.core.IIntegrationEntry; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1002.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1002.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1002.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1002.java index 72b47ef345..aeb13c737c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1002.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1002.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -23,7 +23,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -32,8 +32,8 @@ import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.core.IIntegrationEntry; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1003.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1003.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1003.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1003.java index 212c2fc76e..7cba185731 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1003.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1003.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -23,7 +23,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -32,8 +32,8 @@ import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.core.IIntegrationEntry; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1004.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1004.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1004.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1004.java index 57306a7e6b..b3a17ea9da 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1004.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1004.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -23,7 +23,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -32,8 +32,8 @@ import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.core.IIntegrationEntry; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java index c911ef5858..80834307a9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -23,7 +23,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -33,8 +33,8 @@ import org.eclipse.chemclipse.model.core.IIntegrationEntry; import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java index 9966a4e857..36f2d80250 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -24,7 +24,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -35,9 +35,9 @@ import org.eclipse.chemclipse.model.core.IIntegrationEntry; import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java index fda32d5c0e..33e19f6c76 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -24,7 +24,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -35,9 +35,9 @@ import org.eclipse.chemclipse.model.core.IIntegrationEntry; import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java index 91944c628e..19a56bd3f5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -24,7 +24,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -36,9 +36,9 @@ import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.model.core.IScan; import org.eclipse.chemclipse.model.quantitation.IInternalStandard; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java index b1bfe764d5..1b6c72713c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -26,8 +26,8 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -48,15 +48,15 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java index ae813d771d..30cbaa9c84 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -29,8 +29,8 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -51,15 +51,15 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java index 8862ac6521..ea1e3a2366 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -29,8 +29,8 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -52,15 +52,15 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java index db07867529..fe8d617673 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -30,8 +30,8 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.IChromatogramCSDZipWriter; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.IChromatogramCSDZipWriter; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramPeakCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; @@ -53,15 +53,15 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.ranges.TimeRange; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/ChromatogramReaderCSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/ChromatogramReaderCSD.java similarity index 79% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/ChromatogramReaderCSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/ChromatogramReaderCSD.java index e3d4bcbd0a..7e74f221cd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/ChromatogramReaderCSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/ChromatogramReaderCSD.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - add new version *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.io; import java.io.File; import java.io.FileNotFoundException; @@ -22,30 +22,30 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.csd.converter.io.AbstractChromatogramCSDReader; import org.eclipse.chemclipse.csd.converter.io.IChromatogramCSDReader; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1001; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1002; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1003; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1004; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1005; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1006; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1007; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1100; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1300; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1301; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1400; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1500; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1001; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1002; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1003; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1004; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1005; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1006; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1007; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1100; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1300; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1301; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1400; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramReader_1500; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.core.IChromatogram; import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.model.core.IPeak; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ReaderHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ReaderHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramReaderCSD extends AbstractChromatogramCSDReader implements IChromatogramCSDZipReader { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/ChromatogramWriterCSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/ChromatogramWriterCSD.java similarity index 71% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/ChromatogramWriterCSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/ChromatogramWriterCSD.java index ce33ad1490..9607d90d8c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/ChromatogramWriterCSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/ChromatogramWriterCSD.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - update latest version *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.io; import java.io.File; import java.io.FileNotFoundException; @@ -19,21 +19,21 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1001; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1002; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1003; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1004; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1005; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1006; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1007; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1100; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1300; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1301; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1400; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1500; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1001; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1002; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1003; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1004; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1005; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1006; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1007; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1100; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1300; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1301; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1400; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.internal.io.ChromatogramWriter_1500; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramWriterCSD extends AbstractChromatogramWriter implements IChromatogramCSDZipWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/IChromatogramCSDZipReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/IChromatogramCSDZipReader.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/IChromatogramCSDZipReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/IChromatogramCSDZipReader.java index 0c43886c0c..4c1f687029 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/IChromatogramCSDZipReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/IChromatogramCSDZipReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.io; import java.io.IOException; import java.util.zip.ZipFile; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/IChromatogramCSDZipWriter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/IChromatogramCSDZipWriter.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/IChromatogramCSDZipWriter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/IChromatogramCSDZipWriter.java index 4e91167fd1..9cdd63850d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/io/IChromatogramCSDZipWriter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/io/IChromatogramCSDZipWriter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.io; import java.io.IOException; import java.util.zip.ZipOutputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java index 8c00d7fd8b..fdc5e06913 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/IVendorScan.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/IVendorScan.java index 0f860fb43e..481bb29ea7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/IVendorScan.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.csd.model.core.IScanCSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java index f5553932a1..b8c1cf2247 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.csd.model.core.AbstractChromatogramCSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/VendorScan.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/VendorScan.java index a8d8402376..6654986453 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/csd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/csd/converter/supplier/ocx/model/chromatogram/VendorScan.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.csd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.csd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.csd.model.core.AbstractScanCSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/ChromatogramExportConverter.java similarity index 85% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/ChromatogramExportConverter.java index 21362a4390..6169356425 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/ChromatogramExportConverter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.converter; import java.io.File; @@ -19,11 +19,11 @@ import org.eclipse.chemclipse.model.core.IChromatogram; import org.eclipse.chemclipse.model.core.IPeak; import org.eclipse.chemclipse.msd.converter.io.IChromatogramMSDWriter; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.SpecificationValidator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.SpecificationValidator; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramExportConverter extends AbstractChromatogramExportConverter implements IChromatogramExportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/ChromatogramImportConverter.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/ChromatogramImportConverter.java index 5a2380fc97..221a48f6c8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/ChromatogramImportConverter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.converter; import java.io.File; import java.io.IOException; @@ -18,11 +18,11 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.msd.converter.io.IChromatogramMSDReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.SpecificationValidator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.SpecificationValidator; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/FileContentMatcherMSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/FileContentMatcherMSD.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/FileContentMatcherMSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/FileContentMatcherMSD.java index 97eda0d3ee..d491daba3b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/FileContentMatcherMSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/FileContentMatcherMSD.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.converter; import java.io.File; import java.util.Enumeration; @@ -18,7 +18,7 @@ import org.eclipse.chemclipse.converter.core.AbstractFileContentMatcher; import org.eclipse.chemclipse.converter.core.IFileContentMatcher; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public class FileContentMatcherMSD extends AbstractFileContentMatcher implements IFileContentMatcher { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/PeakExportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/PeakExportConverter.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/PeakExportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/PeakExportConverter.java index 9cae31a2ac..5e403febea 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/PeakExportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/PeakExportConverter.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to new API *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.converter; import java.io.File; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/PeakImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/PeakImportConverter.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/PeakImportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/PeakImportConverter.java index 1e76281c80..a83398d1b3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/converter/PeakImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/converter/PeakImportConverter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.converter; import java.io.File; import java.io.FileNotFoundException; @@ -21,14 +21,14 @@ import org.eclipse.chemclipse.model.core.IPeaks; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; import org.eclipse.chemclipse.msd.converter.peak.AbstractPeakImportConverter; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.PeakReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.PeakReaderMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.IProcessingMessage; import org.eclipse.chemclipse.processing.core.MessageType; import org.eclipse.chemclipse.processing.core.ProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingMessage; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.SpecificationValidator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.SpecificationValidator; import org.eclipse.core.runtime.IProgressMonitor; public class PeakImportConverter extends AbstractPeakImportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java index c6c91233df..7f3cc92a67 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedInputStream; import java.io.DataInputStream; @@ -20,7 +20,7 @@ import java.util.zip.ZipInputStream; import org.eclipse.chemclipse.msd.converter.io.AbstractChromatogramMSDReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; public abstract class AbstractChromatogramReader extends AbstractChromatogramMSDReader implements IChromatogramMSDZipReader { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/AbstractZipReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/AbstractZipReader.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/AbstractZipReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/AbstractZipReader.java index 6fc8c5385a..378ae08f7e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/AbstractZipReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/AbstractZipReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedInputStream; import java.io.DataInputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0701.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0701.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0701.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0701.java index 055f7486a8..40ab9d27d0 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0701.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0701.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -43,13 +43,13 @@ import org.eclipse.chemclipse.model.implementation.IdentificationTarget; import org.eclipse.chemclipse.model.implementation.IntegrationEntry; import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -63,9 +63,9 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.MassSpectrometer; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.MassSpectrumType; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.MassSpectrometer; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.MassSpectrumType; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0801.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0801.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0801.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0801.java index b93bba65de..dd1fdf3a13 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0801.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0801.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -46,13 +46,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -66,7 +66,7 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0802.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0802.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0802.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0802.java index b17822d98e..61c042098d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0802.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0802.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -46,13 +46,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -69,7 +69,7 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0803.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0803.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0803.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0803.java index 169abeee84..71c0a81276 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0803.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0803.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -47,13 +47,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -70,9 +70,9 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0901.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0901.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0901.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0901.java index 87d49956f3..79d40da168 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0901.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0901.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -47,13 +47,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -70,9 +70,9 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0902.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0902.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0902.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0902.java index 6adea24252..f64abd11cf 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0902.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0902.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -49,13 +49,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -72,9 +72,9 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0903.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0903.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0903.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0903.java index ccea3c22e0..f3baffd65b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_0903.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_0903.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -49,13 +49,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -72,9 +72,9 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1001.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1001.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1001.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1001.java index 2c9cb9b3e2..e4fe107b86 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1001.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1001.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -49,13 +49,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -72,9 +72,9 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1002.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1002.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1002.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1002.java index a332fa8df2..f57e64f7eb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1002.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1002.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -53,13 +53,13 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -77,9 +77,9 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1003.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1003.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1003.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1003.java index 08b52ccad3..0f4f4f6086 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1003.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1003.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -53,16 +53,16 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -80,10 +80,10 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1004.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1004.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1004.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1004.java index 2e17f402db..5e2caaef42 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1004.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1004.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -53,16 +53,16 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -81,10 +81,10 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java index eaa3782461..18ff89d948 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -54,16 +54,16 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -82,10 +82,10 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java index f8f26528b7..8f4cf81672 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -54,16 +54,16 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -82,10 +82,10 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java index d100a047c5..383e32a6ff 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -54,16 +54,16 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -82,10 +82,10 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java index 89c38b4029..2169c1e9c8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -56,16 +56,16 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -84,11 +84,11 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java index 02b63be446..a47fd4a68b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -26,7 +26,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -63,17 +63,17 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -92,12 +92,12 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java index 70e477dac4..a5dfc0b71f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -27,7 +27,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -64,17 +64,17 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -93,12 +93,12 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java index 86cb4d141e..2e0ca920f2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,7 +29,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -68,17 +68,17 @@ import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; import org.eclipse.chemclipse.model.targets.LibraryField; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -97,12 +97,12 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java index 3c15d7639f..bf77c5624f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,7 +29,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -68,17 +68,17 @@ import org.eclipse.chemclipse.model.quantitation.QuantitationFlag; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; import org.eclipse.chemclipse.model.targets.LibraryField; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipReader; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScanProxy; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; @@ -97,12 +97,12 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0701.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0701.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0701.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0701.java index 2a151ed68d..88ef51d81a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0701.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0701.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -28,7 +28,7 @@ import org.eclipse.chemclipse.model.identifier.IComparisonResult; import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -39,10 +39,10 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.MassSpectrometer; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.MassSpectrumType; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.MassSpectrometer; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.MassSpectrumType; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0801.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0801.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0801.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0801.java index 1d293e288b..9f4d9bc47b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0801.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0801.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -30,7 +30,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -41,8 +41,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0802.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0802.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0802.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0802.java index e92c750263..cdbb0f3573 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0802.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0802.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -30,7 +30,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -42,8 +42,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0803.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0803.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0803.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0803.java index d066cf115c..e5fbbde99c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0803.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0803.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -31,7 +31,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -43,8 +43,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0901.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0901.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0901.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0901.java index e5f5b378a8..30afbc9647 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0901.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0901.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -31,7 +31,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -43,8 +43,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0902.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0902.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0902.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0902.java index 6ad17bca4a..29bd1cbf8d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0902.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0902.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -31,7 +31,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -43,8 +43,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0903.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0903.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0903.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0903.java index 5a50f96a87..53f6be51c3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_0903.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_0903.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -31,7 +31,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -43,8 +43,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1001.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1001.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1001.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1001.java index be2540dab2..f80a91d79b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1001.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1001.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -31,7 +31,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -43,8 +43,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1002.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1002.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1002.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1002.java index 718e024438..6f0c1f4c8d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1002.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1002.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -32,7 +32,7 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -44,8 +44,8 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1003.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1003.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1003.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1003.java index 848704c03b..1d749a0665 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1003.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1003.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -33,7 +33,7 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -45,10 +45,10 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1004.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1004.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1004.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1004.java index 16b8360247..5e2d19ecd0 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1004.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1004.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -33,7 +33,7 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -46,10 +46,10 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java index 8f5b22fb88..c32f033880 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -34,7 +34,7 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -47,10 +47,10 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java index 02410608b9..1871267f29 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -36,7 +36,7 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -49,11 +49,11 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java index ddcb662cde..41bb7b3e57 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -36,7 +36,7 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -49,11 +49,11 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java index b446780d7c..7df1468d02 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -37,7 +37,7 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -50,11 +50,11 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java index d327e5b388..dd118e6b12 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -28,7 +28,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -45,8 +45,8 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -59,13 +59,13 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java index ce48f1f0b1..4c32edabf1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -30,7 +30,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -47,8 +47,8 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -61,13 +61,13 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java index eafc3ff4a9..736988ed94 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -30,7 +30,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -48,8 +48,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITarget; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -62,13 +62,13 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java index c6d34d9743..783cf8e6f9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -30,7 +30,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -48,9 +48,9 @@ import org.eclipse.chemclipse.model.ranges.TimeRange; import org.eclipse.chemclipse.model.targets.ITarget; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IChromatogramMSDZipWriter; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IChromatogramMSDZipWriter; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramPeakMSD; import org.eclipse.chemclipse.msd.model.core.IIon; @@ -63,13 +63,13 @@ import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ScanProxy; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ScanProxy; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0701.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0701.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0701.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0701.java index 80c1fd21f2..91e847b589 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0701.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0701.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -36,8 +36,8 @@ import org.eclipse.chemclipse.model.implementation.PeakIntensityValues; import org.eclipse.chemclipse.model.implementation.Peaks; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; import org.eclipse.chemclipse.msd.model.core.IPeakModelMSD; @@ -47,9 +47,9 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.MassSpectrometer; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.MassSpectrumType; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.MassSpectrometer; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.MassSpectrumType; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0801.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0801.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0801.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0801.java index 8f1019ce15..ebe13fe5cc 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0801.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0801.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -39,8 +39,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; import org.eclipse.chemclipse.msd.model.core.IPeakModelMSD; @@ -50,7 +50,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0802.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0802.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0802.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0802.java index 9088288bd6..944cbff4e1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0802.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0802.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -42,8 +42,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -57,7 +57,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0803.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0803.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0803.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0803.java index ad41bc67ab..be99126fe5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0803.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0803.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -39,8 +39,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -54,7 +54,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0901.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0901.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0901.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0901.java index ff453ae187..603c8289b0 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0901.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0901.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -42,8 +42,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -57,7 +57,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0902.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0902.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0902.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0902.java index 99d6dee2c4..297cb8dde1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0902.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0902.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -41,8 +41,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -56,7 +56,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0903.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0903.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0903.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0903.java index b6939b7d3f..515e4c9d56 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_0903.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_0903.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -41,8 +41,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -56,7 +56,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1001.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1001.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1001.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1001.java index ea30d12e8a..1370da58a3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1001.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1001.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -41,8 +41,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -56,7 +56,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1002.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1002.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1002.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1002.java index d95ec21571..fd5176c87f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1002.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1002.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -45,8 +45,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -61,7 +61,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1003.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1003.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1003.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1003.java index dcc1ed2878..e26064578a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1003.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1003.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -45,8 +45,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -61,7 +61,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1004.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1004.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1004.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1004.java index f9bfe369ec..4a158face9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1004.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1004.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -45,8 +45,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -62,7 +62,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1005.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1005.java index 3b76b6d205..024861ce50 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1005.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -45,8 +45,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -62,7 +62,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1006.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1006.java index 011570993a..6ca99f08b5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -46,8 +46,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -63,7 +63,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1007.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1007.java index e9595e83ec..96c2e9a521 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -46,8 +46,8 @@ import org.eclipse.chemclipse.model.implementation.QuantitationEntry; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -63,7 +63,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1100.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1100.java index aefc4e56ad..bbd457e1a5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -48,8 +48,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -65,7 +65,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1300.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1300.java index bec81d6c32..6ef1f0ab01 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1300.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -49,8 +49,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -66,7 +66,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1301.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1301.java index 17c1f4784b..fa3e516b3d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1301.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -49,8 +49,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -66,7 +66,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1400.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1400.java index 027a34fd8d..2f0e24a840 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1400.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -49,8 +49,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -66,7 +66,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1500.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1500.java index a611085574..2bf99e058e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/PeakReader_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/PeakReader_1500.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -49,8 +49,8 @@ import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.model.quantitation.QuantitationFlag; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; @@ -66,7 +66,7 @@ import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1003.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1003.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1003.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1003.java index 6f59441924..1e521092c7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1003.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1003.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -27,17 +27,17 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1004.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1004.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1004.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1004.java index 36c0c37536..9a05b4f268 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1004.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1004.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -27,18 +27,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1005.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1005.java index da32852cd6..3ea898523a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1005.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -27,18 +27,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1006.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1006.java index 3a59b920fc..6d220ff314 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,18 +29,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1007.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1007.java index bec92bbaa8..a316bceceb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,18 +29,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1100.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1100.java index 6547948e45..dabeb1592d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,18 +29,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1300.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1300.java index 5db060d682..cfb4051852 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1300.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,18 +29,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1301.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1301.java index dddffeb5cc..338bb8cb75 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1301.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,18 +29,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1400.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1400.java index 91ff551962..39ea2accaf 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1400.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,18 +29,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1500.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1500.java index d9dabf4ad2..747f8f831e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/internal/io/ReaderProxy_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/internal/io/ReaderProxy_1500.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,18 +29,18 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.identifier.LibraryInformation; import org.eclipse.chemclipse.model.implementation.IdentificationTarget; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.IReaderProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.IReaderProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.exceptions.IonLimitExceededException; import org.eclipse.chemclipse.msd.model.exceptions.IonTransitionIsNullException; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /** * Methods are copied to ensure that file formats are kept readable even if they contain errors. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ChromatogramReaderMSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ChromatogramReaderMSD.java similarity index 77% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ChromatogramReaderMSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ChromatogramReaderMSD.java index 0a1dda5f2c..2de325ba16 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ChromatogramReaderMSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ChromatogramReaderMSD.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - add new version *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.io; import java.io.File; import java.io.FileNotFoundException; @@ -20,40 +20,40 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.model.core.IScan; import org.eclipse.chemclipse.msd.converter.io.AbstractChromatogramMSDReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_0701; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_0801; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_0802; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_0803; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_0901; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_0902; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_0903; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1001; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1002; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1003; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1004; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1005; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1006; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1007; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1100; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1300; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1301; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1400; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1500; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorIon; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_0701; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_0801; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_0802; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_0803; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_0901; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_0902; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_0903; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1001; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1002; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1003; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1004; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1005; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1006; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1007; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1100; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1300; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1301; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1400; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramReader_1500; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorIon; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.VendorScan; import org.eclipse.chemclipse.msd.model.core.AbstractIon; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ReaderHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ReaderHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ChromatogramWriterMSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ChromatogramWriterMSD.java similarity index 68% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ChromatogramWriterMSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ChromatogramWriterMSD.java index 67199f98bb..37f100f236 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ChromatogramWriterMSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ChromatogramWriterMSD.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - update latest version *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.io; import java.io.File; import java.io.IOException; @@ -18,28 +18,28 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_0701; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_0801; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_0802; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_0803; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_0901; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_0902; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_0903; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1001; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1002; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1003; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1004; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1005; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1006; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1007; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1100; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1300; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1301; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1400; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1500; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_0701; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_0801; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_0802; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_0803; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_0901; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_0902; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_0903; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1001; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1002; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1003; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1004; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1005; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1006; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1007; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1100; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1300; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1301; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1400; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ChromatogramWriter_1500; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramWriterMSD extends AbstractChromatogramWriter implements IChromatogramMSDZipWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IChromatogramMSDZipReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IChromatogramMSDZipReader.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IChromatogramMSDZipReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IChromatogramMSDZipReader.java index 010e08eb30..96d176f389 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IChromatogramMSDZipReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IChromatogramMSDZipReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.io; import java.io.IOException; import java.util.zip.ZipFile; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IChromatogramMSDZipWriter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IChromatogramMSDZipWriter.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IChromatogramMSDZipWriter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IChromatogramMSDZipWriter.java index e4e95a9668..c8aff65a06 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IChromatogramMSDZipWriter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IChromatogramMSDZipWriter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.io; import java.io.IOException; import java.util.zip.ZipOutputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IReaderProxy.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IReaderProxy.java similarity index 84% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IReaderProxy.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IReaderProxy.java index fdf9816e43..788fd5773f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/IReaderProxy.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/IReaderProxy.java @@ -9,14 +9,14 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.io; import java.io.DataInputStream; import java.io.File; import java.io.IOException; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; public interface IReaderProxy { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/PeakReaderMSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/PeakReaderMSD.java similarity index 64% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/PeakReaderMSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/PeakReaderMSD.java index 72de8d4575..b85e75bbf3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/PeakReaderMSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/PeakReaderMSD.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.io; import java.io.File; import java.io.FileNotFoundException; @@ -19,28 +19,28 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.model.core.IPeaks; import org.eclipse.chemclipse.msd.converter.io.IPeakReader; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_0701; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_0801; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_0802; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_0803; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_0901; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_0902; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_0903; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1001; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1002; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1003; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1004; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1005; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1006; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1007; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1100; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1300; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1301; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1400; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.PeakReader_1500; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_0701; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_0801; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_0802; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_0803; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_0901; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_0902; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_0903; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1001; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1002; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1003; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1004; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1005; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1006; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1007; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1100; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1300; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1301; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1400; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.PeakReader_1500; import org.eclipse.chemclipse.processing.core.IProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ReaderHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ReaderHelper; import org.eclipse.core.runtime.IProgressMonitor; public class PeakReaderMSD implements IPeakReader { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ProxyReaderMSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ProxyReaderMSD.java similarity index 64% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ProxyReaderMSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ProxyReaderMSD.java index 81609f02a2..ac8ad4a5c7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/io/ProxyReaderMSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/io/ProxyReaderMSD.java @@ -9,24 +9,24 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.io; import java.io.File; import java.io.IOException; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1003; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1004; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1005; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1006; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1007; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1100; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1300; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1301; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1400; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.internal.io.ReaderProxy_1500; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram.IVendorScanProxy; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1003; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1004; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1005; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1006; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1007; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1100; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1300; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1301; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1400; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.internal.io.ReaderProxy_1500; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram.IVendorScanProxy; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; public class ProxyReaderMSD { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java index c431a9d425..1529d8a4e1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorIon.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorIon.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorIon.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorIon.java index f29f70b58b..ef05dc8415 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorIon.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorIon.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.msd.model.core.IScanIon; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorScan.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorScan.java index 34a6e73063..c0f2fd372c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorScan.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorScanProxy.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorScanProxy.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorScanProxy.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorScanProxy.java index d36bd7d28f..7b751977b4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/IVendorScanProxy.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/IVendorScanProxy.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrumProxy; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java index 661d69a967..f61d54a855 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.msd.model.core.AbstractChromatogramMSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorIon.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorIon.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorIon.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorIon.java index d5cd7adf67..b541d2e5e4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorIon.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorIon.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.model.exceptions.AbundanceLimitExceededException; import org.eclipse.chemclipse.msd.model.core.AbstractScanIon; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorScan.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorScan.java index 4f41b2598b..71ed5a824a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorScan.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.exceptions.AbundanceLimitExceededException; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorScanProxy.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorScanProxy.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorScanProxy.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorScanProxy.java index af9263b501..a170d7a81e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/msd/converter/supplier/chemclipse/model/chromatogram/VendorScanProxy.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/msd/converter/supplier/ocx/model/chromatogram/VendorScanProxy.java @@ -9,14 +9,14 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.msd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.msd.converter.supplier.ocx.model.chromatogram; import java.io.File; import java.io.IOException; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.exceptions.AbundanceLimitExceededException; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ProxyReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ProxyReaderMSD; import org.eclipse.chemclipse.msd.model.core.AbstractVendorMassSpectrumProxy; import org.eclipse.chemclipse.msd.model.core.IIon; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/ChromatogramExportConverter.java similarity index 85% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/ChromatogramExportConverter.java index ae10a34135..5825076ed9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/ChromatogramExportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/ChromatogramExportConverter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.converter; import java.io.File; @@ -20,10 +20,10 @@ import org.eclipse.chemclipse.model.core.IPeak; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.converter.io.IChromatogramWSDWriter; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.SpecificationValidator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.SpecificationValidator; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramExportConverter extends AbstractChromatogramExportConverter implements IChromatogramExportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/ChromatogramImportConverter.java similarity index 87% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/ChromatogramImportConverter.java index 1c3f290c1e..b5a6753961 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/ChromatogramImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/ChromatogramImportConverter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.converter; import java.io.File; @@ -18,10 +18,10 @@ import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.wsd.converter.io.IChromatogramWSDReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IConstants; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.SpecificationValidator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IConstants; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.SpecificationValidator; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramImportConverter extends AbstractChromatogramImportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/FileContentMatcherWSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/FileContentMatcherWSD.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/FileContentMatcherWSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/FileContentMatcherWSD.java index a6f9a8d286..31b3ef8c5e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/converter/FileContentMatcherWSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/converter/FileContentMatcherWSD.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.converter; import java.io.File; import java.util.Enumeration; @@ -18,7 +18,7 @@ import org.eclipse.chemclipse.converter.core.AbstractFileContentMatcher; import org.eclipse.chemclipse.converter.core.IFileContentMatcher; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public class FileContentMatcherWSD extends AbstractFileContentMatcher implements IFileContentMatcher { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java index eb12a41b45..ac95634245 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/AbstractChromatogramReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/AbstractChromatogramReader.java @@ -9,7 +9,7 @@ * Contributors: * Michael Chang - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.BufferedInputStream; import java.io.DataInputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java index 77fb21f136..994322770b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1005.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,17 +29,17 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java index bb19b4b068..e8d44cbdf2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -31,17 +31,17 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java index cc2f381bc0..a88e20985b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -31,17 +31,17 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; /** diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java index b9aee61e25..04904f6e5b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -31,17 +31,17 @@ import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java index b42bf5e084..8cff403f24 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1300.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -26,7 +26,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -62,18 +62,18 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; @@ -82,9 +82,9 @@ import org.eclipse.chemclipse.wsd.model.core.IScanWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.ChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.PeakModelWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java index b9436e2417..e4d4b7b3c8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1301.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -24,7 +24,7 @@ import java.util.zip.ZipInputStream; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -60,18 +60,18 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.quantitation.InternalStandard; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; @@ -80,9 +80,9 @@ import org.eclipse.chemclipse.wsd.model.core.IScanWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.ChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.PeakModelWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java index 8dce767b50..412a13abf5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1400.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -29,7 +29,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsEmptyException; import org.eclipse.chemclipse.converter.exceptions.FileIsNotReadableException; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -67,18 +67,18 @@ import org.eclipse.chemclipse.model.quantitation.InternalStandard; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; import org.eclipse.chemclipse.model.targets.LibraryField; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; @@ -88,9 +88,9 @@ import org.eclipse.chemclipse.wsd.model.core.implementation.ChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.PeakModelWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.ScanSignalWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java index b26beb71f2..8b5458e324 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramReader_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramReader_1500.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.DataInputStream; import java.io.File; @@ -26,7 +26,7 @@ import java.util.zip.ZipInputStream; import org.eclipse.chemclipse.converter.io.IFileHelper; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramReaderCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramReaderCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.baseline.IBaselineModel; @@ -64,18 +64,18 @@ import org.eclipse.chemclipse.model.quantitation.QuantitationFlag; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; import org.eclipse.chemclipse.model.targets.LibraryField; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramReaderMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramReaderMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.EditInformation; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramReaderWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.IVendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorChromatogram; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScan; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram.VendorScanSignal; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramReaderWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipReader; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.IVendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorChromatogram; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScan; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram.VendorScanSignal; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; @@ -85,9 +85,9 @@ import org.eclipse.chemclipse.wsd.model.core.implementation.ChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.PeakModelWSD; import org.eclipse.chemclipse.wsd.model.core.implementation.ScanSignalWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.BaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IBaselineElement; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.BaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IBaselineElement; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java index 70a9c2a378..a5b28989c2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1005.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1005.java @@ -9,7 +9,7 @@ * Contributors: * Michael Chang - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -26,12 +26,12 @@ import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramWriter_1005 extends AbstractChromatogramWriter implements IChromatogramWSDZipWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java index efa2f9d026..090be61683 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1006.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1006.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -28,13 +28,13 @@ import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramWriter_1006 extends AbstractChromatogramWriter implements IChromatogramWSDZipWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java index 7cbd5704f9..a30359e3b6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1007.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1007.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -28,13 +28,13 @@ import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramWriter_1007 extends AbstractChromatogramWriter implements IChromatogramWSDZipWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java index ced1894216..ccaca7fb4f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1100.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1100.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -28,13 +28,13 @@ import org.eclipse.chemclipse.model.core.IMethod; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java index 86417fbb78..37feb50a40 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1300.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1300.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -26,7 +26,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -43,21 +43,21 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java index f0beb183af..84d6ac6c41 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1301.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1301.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -29,7 +29,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -46,21 +46,21 @@ import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java index ec5d5df291..94af743a60 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1400.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1400.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -29,7 +29,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -47,21 +47,21 @@ import org.eclipse.chemclipse.model.quantitation.IInternalStandard; import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java index 6714242729..1e1fca97d1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/internal/io/ChromatogramWriter_1500.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/internal/io/ChromatogramWriter_1500.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - adjust to API Changes *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeString; import static org.eclipse.chemclipse.converter.io.IFileHelper.writeStringCollection; @@ -30,7 +30,7 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD; +import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD; import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD; import org.eclipse.chemclipse.model.baseline.IBaselineModel; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; @@ -48,21 +48,21 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationEntry; import org.eclipse.chemclipse.model.ranges.TimeRange; import org.eclipse.chemclipse.model.targets.ITargetDisplaySettings; -import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD; +import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.support.history.IEditHistory; import org.eclipse.chemclipse.support.history.IEditInformation; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.IChromatogramWSDZipWriter; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.IChromatogramWSDZipWriter; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakModelWSD; import org.eclipse.chemclipse.wsd.model.core.IPeakWSD; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/ChromatogramReaderWSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/ChromatogramReaderWSD.java similarity index 82% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/ChromatogramReaderWSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/ChromatogramReaderWSD.java index 99c6b2c7a5..d2142abe78 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/ChromatogramReaderWSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/ChromatogramReaderWSD.java @@ -11,7 +11,7 @@ * Philip Wenig - improvements * Christoph Läubrich - add new version *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.io; import java.io.File; import java.io.FileNotFoundException; @@ -24,17 +24,17 @@ import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.wsd.converter.io.AbstractChromatogramWSDReader; import org.eclipse.chemclipse.wsd.converter.io.IChromatogramWSDReader; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1005; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1006; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1007; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1100; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1300; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1301; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1400; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramReader_1500; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1005; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1006; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1007; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1100; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1300; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1301; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1400; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramReader_1500; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.ReaderHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.ReaderHelper; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramReaderWSD extends AbstractChromatogramWSDReader implements IChromatogramWSDZipReader { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/ChromatogramWriterWSD.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/ChromatogramWriterWSD.java similarity index 75% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/ChromatogramWriterWSD.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/ChromatogramWriterWSD.java index 468a58a40d..7580f0a1b4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/ChromatogramWriterWSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/ChromatogramWriterWSD.java @@ -11,7 +11,7 @@ * Philip Wenig - improvements * Christoph Läubrich - update latest version *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.io; import java.io.File; import java.io.FileNotFoundException; @@ -20,17 +20,17 @@ import org.eclipse.chemclipse.converter.exceptions.FileIsNotWriteableException; import org.eclipse.chemclipse.converter.io.AbstractChromatogramWriter; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1005; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1006; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1007; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1100; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1300; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1301; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1400; -import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.internal.io.ChromatogramWriter_1500; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1005; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1006; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1007; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1100; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1300; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1301; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1400; +import org.eclipse.chemclipse.wsd.converter.supplier.ocx.internal.io.ChromatogramWriter_1500; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class ChromatogramWriterWSD extends AbstractChromatogramWriter implements IChromatogramWSDZipWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/IChromatogramWSDZipReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/IChromatogramWSDZipReader.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/IChromatogramWSDZipReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/IChromatogramWSDZipReader.java index de7b5894a9..c1ff2084e4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/IChromatogramWSDZipReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/IChromatogramWSDZipReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.io; import java.io.IOException; import java.util.zip.ZipFile; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/IChromatogramWSDZipWriter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/IChromatogramWSDZipWriter.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/IChromatogramWSDZipWriter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/IChromatogramWSDZipWriter.java index db94cf63aa..3c5a514203 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/io/IChromatogramWSDZipWriter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/io/IChromatogramWSDZipWriter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.io; import java.io.IOException; import java.util.zip.ZipOutputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java index 65c17b0304..1329d9ba82 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorChromatogram.java @@ -9,7 +9,7 @@ * Contributors: * Michael Chang - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorScan.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorScan.java index 590a1e35e8..b4dec98dc5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorScan.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorScan.java @@ -9,7 +9,7 @@ * Contributors: * Michael Chang - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorScanSignal.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorScanSignal.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorScanSignal.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorScanSignal.java index e77eced4bb..28f7a8f1b8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/IVendorScanSignal.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/IVendorScanSignal.java @@ -9,7 +9,7 @@ * Contributors: * Michael Chang - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.wsd.model.core.IScanSignalWSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java index b1a8a16858..b19bb4806b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorChromatogram.java @@ -9,7 +9,7 @@ * Contributors: * Michael Chang - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.wsd.model.core.AbstractChromatogramWSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorScan.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorScan.java index 7001450f82..8128d61ee6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorScan.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorScan.java @@ -9,7 +9,7 @@ * Contributors: * Michael Chang - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.wsd.model.core.AbstractScanWSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorScanSignal.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorScanSignal.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorScanSignal.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorScanSignal.java index e8a5c27bcd..00a46b5d9b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/wsd/converter/supplier/chemclipse/model/chromatogram/VendorScanSignal.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/wsd/converter/supplier/ocx/model/chromatogram/VendorScanSignal.java @@ -10,7 +10,7 @@ * Michael Chang - initial API and implementation * Philip Wenig - serial version *******************************************************************************/ -package org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.model.chromatogram; +package org.eclipse.chemclipse.wsd.converter.supplier.ocx.model.chromatogram; import org.eclipse.chemclipse.wsd.model.core.AbstractScanSignalWSD; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/io/exception/UnknownVersionException.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/io/exception/UnknownVersionException.java similarity index 100% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/io/exception/UnknownVersionException.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/io/exception/UnknownVersionException.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/Activator.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/Activator.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/Activator.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/Activator.java index ca5b4046fd..40778b1c63 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/Activator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/Activator.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ChromatogramProcedure.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ChromatogramProcedure.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ChromatogramProcedure.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ChromatogramProcedure.java index 6b76e850de..9548ad71c4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ChromatogramProcedure.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ChromatogramProcedure.java @@ -10,7 +10,7 @@ * Christoph Läubrich - initial API and implementation * Philip Wenig - update version *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx; import java.io.File; import java.io.IOException; @@ -39,13 +39,13 @@ public class ChromatogramProcedure implements Procedure MSD_IMPORT = new org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter.ChromatogramImportConverter(); - private final IChromatogramImportConverter CSD_IMPORT = new org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter.ChromatogramImportConverter(); - private final IChromatogramImportConverter WSD_IMPORT = new org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.converter.ChromatogramImportConverter(); + private final IChromatogramImportConverter MSD_IMPORT = new org.eclipse.chemclipse.msd.converter.supplier.ocx.converter.ChromatogramImportConverter(); + private final IChromatogramImportConverter CSD_IMPORT = new org.eclipse.chemclipse.csd.converter.supplier.ocx.converter.ChromatogramImportConverter(); + private final IChromatogramImportConverter WSD_IMPORT = new org.eclipse.chemclipse.wsd.converter.supplier.ocx.converter.ChromatogramImportConverter(); // - private final IChromatogramExportConverter MSD_EXPORT = new org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter.ChromatogramExportConverter(); - private final IChromatogramExportConverter CSD_EXPORT = new org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter.ChromatogramExportConverter(); - private final IChromatogramExportConverter WSD_EXPORT = new org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.converter.ChromatogramExportConverter(); + private final IChromatogramExportConverter MSD_EXPORT = new org.eclipse.chemclipse.msd.converter.supplier.ocx.converter.ChromatogramExportConverter(); + private final IChromatogramExportConverter CSD_EXPORT = new org.eclipse.chemclipse.csd.converter.supplier.ocx.converter.ChromatogramExportConverter(); + private final IChromatogramExportConverter WSD_EXPORT = new org.eclipse.chemclipse.wsd.converter.supplier.ocx.converter.ChromatogramExportConverter(); @Override public String getName() { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ChromatogramProcedureSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ChromatogramProcedureSettings.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ChromatogramProcedureSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ChromatogramProcedureSettings.java index 62afdb59d4..8211561817 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/ChromatogramProcedureSettings.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/ChromatogramProcedureSettings.java @@ -10,7 +10,7 @@ * Christoph Läubrich - initial API and implementation * Philip Wenig - update version *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx; import org.eclipse.chemclipse.model.settings.IProcessSettings; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/PathResolver.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/PathResolver.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/PathResolver.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/PathResolver.java index 4e824bdc78..8aa8e787da 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/PathResolver.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/PathResolver.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx; import java.io.IOException; import java.net.URL; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/converter/MagicNumberMatcher.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/converter/MagicNumberMatcher.java similarity index 85% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/converter/MagicNumberMatcher.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/converter/MagicNumberMatcher.java index 7276c8ddfd..303a7cceb6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/converter/MagicNumberMatcher.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/converter/MagicNumberMatcher.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.converter; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.converter; import java.io.File; import org.eclipse.chemclipse.converter.core.AbstractMagicNumberMatcher; import org.eclipse.chemclipse.converter.core.IMagicNumberMatcher; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.IFormatVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.IFormatVersion; public class MagicNumberMatcher extends AbstractMagicNumberMatcher implements IMagicNumberMatcher { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/AbstractMethodReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/AbstractMethodReader.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/AbstractMethodReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/AbstractMethodReader.java index 16d23de0ac..cb432683c4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/AbstractMethodReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/AbstractMethodReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.BufferedInputStream; import java.io.DataInputStream; @@ -22,7 +22,7 @@ import org.eclipse.chemclipse.processing.core.IMessageConsumer; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; public abstract class AbstractMethodReader implements IMethodReader { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/AbstractMethodWriter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/AbstractMethodWriter.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/AbstractMethodWriter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/AbstractMethodWriter.java index 7075547111..b16736152a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/AbstractMethodWriter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/AbstractMethodWriter.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - API *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -23,8 +23,8 @@ import org.eclipse.chemclipse.processing.core.IMessageConsumer; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public abstract class AbstractMethodWriter implements IMethodWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/GenericStreamMethodFormat.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/GenericStreamMethodFormat.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/GenericStreamMethodFormat.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/GenericStreamMethodFormat.java index bc5932113f..f2094d75f5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/GenericStreamMethodFormat.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/GenericStreamMethodFormat.java @@ -9,7 +9,7 @@ * Contributors: * Christoph Läubrich - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.IOException; import java.io.InputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/IMethodReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/IMethodReader.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/IMethodReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/IMethodReader.java index fc76bc12f1..75ef55ef08 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/IMethodReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/IMethodReader.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - stream support *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.BufferedInputStream; import java.io.File; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/IMethodWriter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/IMethodWriter.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/IMethodWriter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/IMethodWriter.java index e464a12ef9..3bdf9e4f94 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/IMethodWriter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/IMethodWriter.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - API *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.File; import java.io.FileOutputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1003.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1003.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1003.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1003.java index 7569b1a017..8541a8872d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1003.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1003.java @@ -10,7 +10,7 @@ * Christoph Läubrich - initial API and implementation * Philip Wenig - enable profiles *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.IOException; import java.io.ObjectInputStream; @@ -25,7 +25,7 @@ import org.eclipse.chemclipse.processing.methods.IProcessEntry; import org.eclipse.chemclipse.processing.methods.IProcessMethod; import org.eclipse.chemclipse.processing.methods.ProcessEntryContainer; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; public class MethodReaderWriter_1003 extends ObjectStreamMethodFormat { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1004.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1004.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1004.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1004.java index 754e565399..2a4e304958 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1004.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1004.java @@ -10,7 +10,7 @@ * Christoph Läubrich - initial API and implementation * Philip Wenig - next version *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.IOException; import java.io.ObjectInputStream; @@ -26,7 +26,7 @@ import org.eclipse.chemclipse.processing.methods.IProcessEntry; import org.eclipse.chemclipse.processing.methods.IProcessMethod; import org.eclipse.chemclipse.processing.methods.ProcessEntryContainer; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; public class MethodReaderWriter_1004 extends ObjectStreamMethodFormat { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1401.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1401.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1401.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1401.java index c2335c8c8a..c9400d94dc 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReaderWriter_1401.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReaderWriter_1401.java @@ -10,7 +10,7 @@ * Christoph Läubrich - initial API and implementation * Philip Wenig - next version *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.IOException; import java.io.ObjectInputStream; @@ -26,7 +26,7 @@ import org.eclipse.chemclipse.processing.methods.IProcessEntry; import org.eclipse.chemclipse.processing.methods.IProcessMethod; import org.eclipse.chemclipse.processing.methods.ProcessEntryContainer; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.IProgressMonitor; public class MethodReaderWriter_1401 extends ObjectStreamMethodFormat { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReader_1000.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReader_1000.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReader_1000.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReader_1000.java index 9db0431c49..4bc5465833 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReader_1000.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReader_1000.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.DataInputStream; import java.io.File; @@ -20,7 +20,7 @@ import org.eclipse.chemclipse.model.types.DataType; import org.eclipse.chemclipse.processing.DataCategory; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public class MethodReader_1000 extends AbstractMethodReader { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReader_1001.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReader_1001.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReader_1001.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReader_1001.java index d5c6635a58..4a19ac27b9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodReader_1001.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodReader_1001.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.DataInputStream; import java.io.File; @@ -20,7 +20,7 @@ import org.eclipse.chemclipse.model.types.DataType; import org.eclipse.chemclipse.processing.DataCategory; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public class MethodReader_1001 extends AbstractMethodReader { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodWriter_1000.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodWriter_1000.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodWriter_1000.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodWriter_1000.java index d05eead42f..032a62af1e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodWriter_1000.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodWriter_1000.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - API *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.DataOutputStream; import java.io.IOException; @@ -20,7 +20,7 @@ import org.eclipse.chemclipse.processing.DataCategory; import org.eclipse.chemclipse.processing.methods.IProcessEntry; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public class MethodWriter_1000 extends AbstractMethodWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodWriter_1001.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodWriter_1001.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodWriter_1001.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodWriter_1001.java index e185f4967a..38c051a985 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/MethodWriter_1001.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/MethodWriter_1001.java @@ -9,7 +9,7 @@ * Contributors: * Christoph Läubrich - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.DataOutputStream; import java.io.IOException; @@ -19,7 +19,7 @@ import org.eclipse.chemclipse.processing.DataCategory; import org.eclipse.chemclipse.processing.methods.IProcessEntry; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public class MethodWriter_1001 extends AbstractMethodWriter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/ObjectStreamMethodFormat.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/ObjectStreamMethodFormat.java similarity index 98% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/ObjectStreamMethodFormat.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/ObjectStreamMethodFormat.java index 5baebf8600..4c34833c83 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/methods/ObjectStreamMethodFormat.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/methods/ObjectStreamMethodFormat.java @@ -9,7 +9,7 @@ * Contributors: * Christoph Läubrich - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods; import java.io.IOException; import java.io.InputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/AbstractDatabaseReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/AbstractDatabaseReader.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/AbstractDatabaseReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/AbstractDatabaseReader.java index 2eed156bef..62b5c6579e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/AbstractDatabaseReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/AbstractDatabaseReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation; import java.io.BufferedInputStream; import java.io.DataInputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/DatabaseReader_1000.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/DatabaseReader_1000.java similarity index 99% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/DatabaseReader_1000.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/DatabaseReader_1000.java index c72a7716a1..291fdf0b46 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/DatabaseReader_1000.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/DatabaseReader_1000.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation; import java.io.DataInputStream; import java.io.File; @@ -72,7 +72,7 @@ import org.eclipse.chemclipse.msd.model.implementation.PeakModelMSD; import org.eclipse.chemclipse.msd.model.implementation.QuantitationPeakMSD; import org.eclipse.chemclipse.msd.model.implementation.ScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.chemclipse.xxd.model.quantitation.QuantitationCompound; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/DatabaseWriter_1000.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/DatabaseWriter_1000.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/DatabaseWriter_1000.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/DatabaseWriter_1000.java index be1380f9cd..375345265f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/DatabaseWriter_1000.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/DatabaseWriter_1000.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation; import java.io.BufferedOutputStream; import java.io.DataOutputStream; @@ -45,9 +45,9 @@ import org.eclipse.chemclipse.msd.model.core.IPeakModelMSD; import org.eclipse.chemclipse.msd.model.core.IRegularMassSpectrum; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.RetentionIndexTypeSupport; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.RetentionIndexTypeSupport; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/IDatabaseReader.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/IDatabaseReader.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/IDatabaseReader.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/IDatabaseReader.java index 9b0f280287..709c2bec5c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/IDatabaseReader.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/IDatabaseReader.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation; import java.io.File; import java.io.IOException; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/IDatabaseWriter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/IDatabaseWriter.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/IDatabaseWriter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/IDatabaseWriter.java index 1c57864b8c..18b7d8f423 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/quantitation/IDatabaseWriter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/quantitation/IDatabaseWriter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation; import java.io.File; import java.io.IOException; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/BaselineElement.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/BaselineElement.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/BaselineElement.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/BaselineElement.java index 37faedb1f8..4a63cc9643 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/BaselineElement.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/BaselineElement.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; public class BaselineElement implements IBaselineElement { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IBaselineElement.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IBaselineElement.java similarity index 88% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IBaselineElement.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IBaselineElement.java index 86e6a515d4..42ed164eab 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IBaselineElement.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IBaselineElement.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; public interface IBaselineElement { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IConstants.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IConstants.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IConstants.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IConstants.java index 4296e0cf9e..9e03151c90 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IConstants.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IConstants.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; public interface IConstants { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IFormat.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IFormat.java similarity index 99% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IFormat.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IFormat.java index 2ad4087f57..dc8f660eb5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IFormat.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IFormat.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - add new format *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; import java.util.zip.ZipOutputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IScanProxy.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IScanProxy.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IScanProxy.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IScanProxy.java index 2e5b3a6655..ef7e921b87 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/IScanProxy.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/IScanProxy.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; public interface IScanProxy { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/MassSpectrometer.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/MassSpectrometer.java similarity index 87% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/MassSpectrometer.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/MassSpectrometer.java index 9d33e7ae03..733e375140 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/MassSpectrometer.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/MassSpectrometer.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; public enum MassSpectrometer { MS1, MS2, MS3; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/MassSpectrumType.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/MassSpectrumType.java similarity index 87% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/MassSpectrumType.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/MassSpectrumType.java index 337928b9f2..8ecdfdd04d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/MassSpectrumType.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/MassSpectrumType.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; public enum MassSpectrumType { CENTROID, PROFILE; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/ReaderHelper.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/ReaderHelper.java similarity index 97% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/ReaderHelper.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/ReaderHelper.java index efd8efd4f9..9efd78b250 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/ReaderHelper.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/ReaderHelper.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; import java.io.BufferedInputStream; import java.io.DataInputStream; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/RetentionIndexTypeSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/RetentionIndexTypeSupport.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/RetentionIndexTypeSupport.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/RetentionIndexTypeSupport.java index fd5496b0f6..67f51d88fe 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/RetentionIndexTypeSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/RetentionIndexTypeSupport.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; import org.eclipse.chemclipse.model.columns.SeparationColumnType; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/ScanProxy.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/ScanProxy.java similarity index 95% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/ScanProxy.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/ScanProxy.java index 3114761211..5915c8cfa1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/ScanProxy.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/ScanProxy.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; public class ScanProxy implements IScanProxy { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/SpecificationValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/SpecificationValidator.java similarity index 94% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/SpecificationValidator.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/SpecificationValidator.java index 1bf6bb3398..1525b37d23 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/SpecificationValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/SpecificationValidator.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; import java.io.File; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/FileContentMatcher.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/FileContentMatcher.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/FileContentMatcher.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/FileContentMatcher.java index 110daee33b..96e81d47cd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/FileContentMatcher.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/FileContentMatcher.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.methods; import java.io.File; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MagicNumberMatcher.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MagicNumberMatcher.java similarity index 92% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MagicNumberMatcher.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MagicNumberMatcher.java index a64a604d3d..bf8a97643f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MagicNumberMatcher.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MagicNumberMatcher.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.methods; import java.io.File; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MethodExportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MethodExportConverter.java similarity index 71% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MethodExportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MethodExportConverter.java index 75fdd1a37b..418dfff18e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MethodExportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MethodExportConverter.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - Generics *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.methods; import java.io.File; import java.io.IOException; @@ -20,14 +20,14 @@ import org.eclipse.chemclipse.converter.methods.IMethodExportConverter; import org.eclipse.chemclipse.processing.core.IMessageConsumer; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.IMethodWriter; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReaderWriter_1003; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReaderWriter_1004; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReaderWriter_1401; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodWriter_1000; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodWriter_1001; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.IMethodWriter; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReaderWriter_1003; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReaderWriter_1004; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReaderWriter_1401; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodWriter_1000; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodWriter_1001; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.eclipse.core.runtime.IProgressMonitor; public class MethodExportConverter extends AbstractExportConverter implements IMethodExportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MethodImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MethodImportConverter.java similarity index 80% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MethodImportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MethodImportConverter.java index 48caeb3e11..03e13762ac 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/methods/MethodImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/methods/MethodImportConverter.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - add stream support *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.methods; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.methods; import java.io.File; import java.io.IOException; @@ -21,12 +21,12 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; import org.eclipse.chemclipse.processing.methods.IProcessMethod; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.IMethodReader; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReaderWriter_1003; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReaderWriter_1004; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReaderWriter_1401; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReader_1000; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.methods.MethodReader_1001; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.IMethodReader; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReaderWriter_1003; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReaderWriter_1004; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReaderWriter_1401; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReader_1000; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.methods.MethodReader_1001; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/preferences/PreferenceInitializer.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/preferences/PreferenceInitializer.java similarity index 90% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/preferences/PreferenceInitializer.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/preferences/PreferenceInitializer.java index 82a664d659..73dfb25056 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/preferences/PreferenceInitializer.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/preferences/PreferenceInitializer.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences; import org.eclipse.chemclipse.support.preferences.AbstractExtendedPreferenceInitializer; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/preferences/PreferenceSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/preferences/PreferenceSupplier.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/preferences/PreferenceSupplier.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/preferences/PreferenceSupplier.java index 8796ceef70..f3f1c8289e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/preferences/PreferenceSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/preferences/PreferenceSupplier.java @@ -10,14 +10,14 @@ * Dr. Philip Wenig - initial API and implementation * Christoph Läubrich - new format *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences; import java.util.HashMap; import java.util.Map; import org.eclipse.chemclipse.support.preferences.IPreferenceSupplier; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.Activator; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.Activator; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.core.runtime.preferences.InstanceScope; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/DatabaseExportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/DatabaseExportConverter.java similarity index 86% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/DatabaseExportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/DatabaseExportConverter.java index eaa5f8f1d6..1fe930d723 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/DatabaseExportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/DatabaseExportConverter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.quantitation; import java.io.File; import java.io.IOException; @@ -20,8 +20,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationDatabase; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation.DatabaseWriter_1000; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation.IDatabaseWriter; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation.DatabaseWriter_1000; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation.IDatabaseWriter; import org.eclipse.core.runtime.IProgressMonitor; public class DatabaseExportConverter extends AbstractQuantDBExportConverter implements IQuantDBExportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/DatabaseImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/DatabaseImportConverter.java similarity index 86% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/DatabaseImportConverter.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/DatabaseImportConverter.java index 776b73ea4c..249511fc23 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/DatabaseImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/DatabaseImportConverter.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.quantitation; import java.io.File; import java.io.IOException; @@ -20,8 +20,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationDatabase; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation.DatabaseReader_1000; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.quantitation.IDatabaseReader; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation.DatabaseReader_1000; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.quantitation.IDatabaseReader; import org.eclipse.core.runtime.IProgressMonitor; public class DatabaseImportConverter extends AbstractQuantDBImportConverter implements IQuantDBImportConverter { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/MagicNumberMatcher.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/MagicNumberMatcher.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/MagicNumberMatcher.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/MagicNumberMatcher.java index 7db485a282..07543b4079 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/quantitation/MagicNumberMatcher.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/quantitation/MagicNumberMatcher.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.quantitation; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.quantitation; import java.io.File; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/settings/ChromatogramExportSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/settings/ChromatogramExportSettings.java similarity index 87% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/settings/ChromatogramExportSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/settings/ChromatogramExportSettings.java index 63fe95143c..fe29895561 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/settings/ChromatogramExportSettings.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/settings/ChromatogramExportSettings.java @@ -9,11 +9,11 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.settings; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.settings; import org.eclipse.chemclipse.support.settings.IntSettingsProperty; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.ChromatogramVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.ChromatogramVersion; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/system/ConverterProcessSettings.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/system/ConverterProcessSettings.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/system/ConverterProcessSettings.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/system/ConverterProcessSettings.java index 60f01e69a8..5744abc3e6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/system/ConverterProcessSettings.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/system/ConverterProcessSettings.java @@ -9,13 +9,13 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.system; import org.eclipse.chemclipse.processing.system.ISystemProcessSettings; import org.eclipse.chemclipse.support.settings.IntSettingsProperty; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.ChromatogramVersion; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.MethodVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.ChromatogramVersion; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.MethodVersion; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/system/ConverterProcessSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/system/ConverterProcessSupplier.java similarity index 93% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/system/ConverterProcessSupplier.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/system/ConverterProcessSupplier.java index 5edc1c9762..9a1cedf833 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/system/ConverterProcessSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/system/ConverterProcessSupplier.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.system; import java.util.Collection; import java.util.Collections; @@ -20,7 +20,7 @@ import org.eclipse.chemclipse.processing.system.AbstractSystemProcessSettings; import org.eclipse.chemclipse.processing.system.AbstractSystemProcessSupplier; import org.eclipse.chemclipse.processing.system.ISystemProcessSettings; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; import org.osgi.service.component.annotations.Component; @Component(service = {IProcessTypeSupplier.class}) diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/ChromatogramVersion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/ChromatogramVersion.java similarity index 91% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/ChromatogramVersion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/ChromatogramVersion.java index 1c2f37ee90..355ab8803b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/ChromatogramVersion.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/ChromatogramVersion.java @@ -9,10 +9,10 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions; import org.eclipse.chemclipse.support.text.ILabel; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; /* * Ensure backward and forward compatibility! diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/IFormatVersion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/IFormatVersion.java similarity index 96% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/IFormatVersion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/IFormatVersion.java index 85d266234e..6af540c977 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/IFormatVersion.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/IFormatVersion.java @@ -9,7 +9,7 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions; public interface IFormatVersion { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/MethodVersion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/MethodVersion.java similarity index 89% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/MethodVersion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/MethodVersion.java index 2f5001e4f3..9c4f8975d9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/MethodVersion.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/MethodVersion.java @@ -9,10 +9,10 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions; import org.eclipse.chemclipse.support.text.ILabel; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public enum MethodVersion implements IFormatVersion, ILabel { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/QuantDatabaseVersion.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/QuantDatabaseVersion.java similarity index 87% rename from chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/QuantDatabaseVersion.java rename to chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/QuantDatabaseVersion.java index 32c15be768..fb7c9ceeee 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/versions/QuantDatabaseVersion.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.ocx/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/versions/QuantDatabaseVersion.java @@ -9,10 +9,10 @@ * Contributors: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions; import org.eclipse.chemclipse.support.text.ILabel; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support.IFormat; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support.IFormat; public enum QuantDatabaseVersion implements IFormatVersion, ILabel { diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.backfolding.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.backfolding.fragment.test/META-INF/MANIFEST.MF index 8bc444ba76..43535cb4ce 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.backfolding.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.backfolding.fragment.test/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: ChemClipse Import-Package: org.eclipse.chemclipse.chromatogram.msd.peak.detector diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.coda.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.coda.fragment.test/META-INF/MANIFEST.MF index b89a9f409d..df3782c4ba 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.coda.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.coda.fragment.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: ChemClipse diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.denoising.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.denoising.fragment.test/META-INF/MANIFEST.MF index c1f76915a2..25aa25d44c 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.denoising.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.msd.filter.supplier.denoising.fragment.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: ChemClipse diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.dyson.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.dyson.fragment.test/META-INF/MANIFEST.MF index 20f637bbf0..31dacc4564 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.dyson.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.dyson.fragment.test/META-INF/MANIFEST.MF @@ -10,4 +10,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.stein.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.stein.fragment.test/META-INF/MANIFEST.MF index c24867f719..b24521dcc3 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.stein.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.calculator.supplier.noise.stein.fragment.test/META-INF/MANIFEST.MF @@ -10,4 +10,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.meannormalizer.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.meannormalizer.fragment.test/META-INF/MANIFEST.MF index baae839c43..47d50e2321 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.meannormalizer.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.meannormalizer.fragment.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: Chemclipse diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.mediannormalizer.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.mediannormalizer.fragment.test/META-INF/MANIFEST.MF index e30f10e9da..7b6cf03758 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.mediannormalizer.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.mediannormalizer.fragment.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: Chemclipse diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.multiplier.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.multiplier.fragment.test/META-INF/MANIFEST.MF index 6d1d2973ac..bfc0d66e4a 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.multiplier.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.multiplier.fragment.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: Chemclipse diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.normalizer.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.normalizer.fragment.test/META-INF/MANIFEST.MF index 2006b3c169..5b9e9c61a3 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.normalizer.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.normalizer.fragment.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: Chemclipse diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.unitsumnormalizer.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.unitsumnormalizer.fragment.test/META-INF/MANIFEST.MF index 579d339b1a..15953723b4 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.unitsumnormalizer.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.unitsumnormalizer.fragment.test/META-INF/MANIFEST.MF @@ -10,4 +10,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" diff --git a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.integrator.supplier.trapezoid.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.integrator.supplier.trapezoid.fragment.test/META-INF/MANIFEST.MF index c14b404012..d858651248 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.integrator.supplier.trapezoid.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.chromatogram.xxd.integrator.supplier.trapezoid.fragment.test/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0", org.eclipse.chemclipse.converter;bundle-version="0.8.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" Bundle-Vendor: ChemClipse diff --git a/chemclipse/tests/org.eclipse.chemclipse.msd.converter.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.msd.converter.fragment.test/META-INF/MANIFEST.MF index 13eab9a6d3..8d2c04bb61 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.msd.converter.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.msd.converter.fragment.test/META-INF/MANIFEST.MF @@ -9,4 +9,4 @@ Fragment-Host: org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.chemclipse.msd.converter.supplier.amdis;bundle-version="0.9.0", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" diff --git a/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.csv.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.csv.fragment.test/META-INF/MANIFEST.MF index 81673fe416..7efe869056 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.csv.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.csv.fragment.test/META-INF/MANIFEST.MF @@ -8,4 +8,4 @@ Bundle-Vendor: Chemclipse Fragment-Host: org.eclipse.chemclipse.msd.converter.supplier.csv;bundle-version="0.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.8.1", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0" + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0" diff --git a/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.excel.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.excel.fragment.test/META-INF/MANIFEST.MF index 7c509ad95c..0a052c24a2 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.excel.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.msd.converter.supplier.excel.fragment.test/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: ChemClipse Fragment-Host: org.eclipse.chemclipse.msd.converter.supplier.excel;bundle-version="0.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.8.1", - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.9.0", + org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.9.0", org.apache.commons.commons-collections4;bundle-version="4.4.0", wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0", org.apache.commons.commons-compress;bundle-version="1.22.0" diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.classpath b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.classpath similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.classpath rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.classpath diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.gitignore b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.gitignore similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.gitignore rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.gitignore diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.project b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.project similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.project rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.project index 08529fbefa..2ccb2f2c57 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.project +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.project @@ -1,6 +1,6 @@ - org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test + org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.settings/org.eclipse.core.resources.prefs b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.settings/org.eclipse.core.resources.prefs rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.settings/org.eclipse.core.resources.prefs diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.settings/org.eclipse.jdt.core.prefs b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/.settings/org.eclipse.jdt.core.prefs rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/.settings/org.eclipse.jdt.core.prefs diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/META-INF/MANIFEST.MF b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/META-INF/MANIFEST.MF similarity index 73% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/META-INF/MANIFEST.MF rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/META-INF/MANIFEST.MF index f31d8b5daf..43578c8dd2 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/META-INF/MANIFEST.MF +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test +Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test Bundle-ManifestVersion: 2 Bundle-Name: Converter Test -Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test +Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Chemclipse -Fragment-Host: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.8.0" +Fragment-Host: org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.chemclipse.rcp.app.test;bundle-version="0.8.0", org.junit;bundle-version="4.13.2" diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/build.properties b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/build.properties similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/build.properties rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/build.properties diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/AllTests.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/AllTests.java similarity index 91% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/AllTests.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/AllTests.java index c235f6f88a..c9b36c0f58 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/AllTests.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/AllTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2021 Lablicate GmbH. + * Copyright (c) 2014, 2023 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.xxd.converter.supplier.chemclipse; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx; import org.eclipse.chemclipse.rcp.app.test.TestAssembler; diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/MethodReaderTest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/MethodReaderTest.java similarity index 95% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/MethodReaderTest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/MethodReaderTest.java index 2fa740ef9e..f68618d807 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/MethodReaderTest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/MethodReaderTest.java @@ -9,7 +9,7 @@ * Contributors: * Christoph Läubrich - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,8 +29,8 @@ import org.eclipse.chemclipse.processing.core.ProcessingInfo; import org.eclipse.chemclipse.processing.methods.IProcessMethod; import org.eclipse.chemclipse.processing.methods.ProcessEntryContainer; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.methods.MethodExportConverter; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.methods.MethodImportConverter; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.methods.MethodExportConverter; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.methods.MethodImportConverter; import org.junit.Ignore; import org.junit.Test; diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/TestPathHelper.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/TestPathHelper.java similarity index 99% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/TestPathHelper.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/TestPathHelper.java index 36360c0f7a..55a025232f 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/TestPathHelper.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/TestPathHelper.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx; /** * THIS CLASS IS NOT SUITED FOR PRODUCTIVE USE!
diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/RetentionIndexTypeSupport_1_Test.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/RetentionIndexTypeSupport_1_Test.java similarity index 91% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/RetentionIndexTypeSupport_1_Test.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/RetentionIndexTypeSupport_1_Test.java index 8859e76e1b..9b57d156a1 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/internal/support/RetentionIndexTypeSupport_1_Test.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/internal/support/RetentionIndexTypeSupport_1_Test.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2018 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: * Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.internal.support; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.internal.support; import org.eclipse.chemclipse.model.columns.SeparationColumnType; diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderFIDTestCase.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderFIDTestCase.java similarity index 96% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderFIDTestCase.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderFIDTestCase.java index a0b225957f..2377a4c5c8 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderFIDTestCase.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderFIDTestCase.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - Generics *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.io.File; diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderMSDTestCase.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderMSDTestCase.java similarity index 96% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderMSDTestCase.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderMSDTestCase.java index 23551fc657..092e6cd1bf 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderMSDTestCase.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderMSDTestCase.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - Generics *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.io.File; diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderWSDTestCase.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderWSDTestCase.java similarity index 96% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderWSDTestCase.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderWSDTestCase.java index b81a40c4f8..1ef3a32e45 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReaderWSDTestCase.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReaderWSDTestCase.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - Generics *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.io.File; diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1001_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1001_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1001_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1001_ITest.java index 20accbadc8..5f6a4a8933 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1001_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1001_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1001_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1002_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1002_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1002_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1002_ITest.java index 59b8e7690d..be1843b202 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1002_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1002_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1002_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1003_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1003_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1003_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1003_ITest.java index 7ea6251387..e8bef51a8d 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1003_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1003_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1003_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1004_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1004_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1004_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1004_ITest.java index b79fd1b62e..db407b150e 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1004_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1004_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1004_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1005_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1005_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1005_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1005_ITest.java index 375d163e87..ffca50ceef 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1005_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1005_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1005_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1006_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1006_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1006_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1006_ITest.java index decf61f8e2..dcc8fdf7e7 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1006_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1006_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1006_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1007_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1007_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1007_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1007_ITest.java index 160b810ab1..0b8df1fc90 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1007_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1007_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1007_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1100_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1100_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1100_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1100_ITest.java index a7437b89d4..5bef99c883 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1100_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1100_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1100_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1300_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1300_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1300_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1300_ITest.java index 035512a448..2f27557e23 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1300_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1300_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1300_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1301_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1301_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1301_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1301_ITest.java index 57dad70f0a..97ce2db7d8 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1301_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1301_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1301_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1400_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1400_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1400_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1400_ITest.java index ed4a508d36..784bb79e0b 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1400_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1400_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1400_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1500_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1500_ITest.java similarity index 87% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1500_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1500_ITest.java index 2845a74c86..9a4b0e6af4 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_FID_1500_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_FID_1500_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_1_FID_1500_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0701_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0701_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0701_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0701_ITest.java index 5048d2809d..daa867450f 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0701_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0701_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_0701_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0801_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0801_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0801_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0801_ITest.java index 74f70d7dbd..46e457d494 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0801_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0801_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_0801_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0802_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0802_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0802_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0802_ITest.java index 2656602e2b..d658d3c279 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0802_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0802_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_0802_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0803_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0803_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0803_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0803_ITest.java index d79fcfa83b..c8bbb0e4d9 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0803_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0803_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_0803_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0901_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0901_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0901_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0901_ITest.java index f5474afbf7..f7f962fd77 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0901_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0901_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_0901_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0902_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0902_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0902_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0902_ITest.java index de5e5e7654..6533d5644d 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0902_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0902_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_0902_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0903_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0903_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0903_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0903_ITest.java index 0f45c3b4f8..664a3acfa2 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_0903_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_0903_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_0903_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1001_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1001_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1001_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1001_ITest.java index c83484f485..20c19c0351 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1001_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1001_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_1001_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1002_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1002_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1002_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1002_ITest.java index cc1959ed8e..48e07e6c11 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1002_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1002_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_1_MSD_1002_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1003_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1003_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1003_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1003_ITest.java index 721051e0be..e7fddb2f08 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1003_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1003_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1003_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1004_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1004_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1004_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1004_ITest.java index 948ed67d08..afdf25bbf5 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1004_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1004_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1004_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1005_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1005_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1005_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1005_ITest.java index 3864c2e59e..afa8a56bc0 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1005_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1005_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1005_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1006_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1006_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1006_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1006_ITest.java index 2b875d4485..7f1eb37b0e 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1006_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1006_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1006_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1007_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1007_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1007_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1007_ITest.java index e77f00ec8b..2c846a3659 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1007_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1007_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1007_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1100_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1100_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1100_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1100_ITest.java index 13e3b8120e..b7193edff4 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1100_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1100_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1100_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1300_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1300_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1300_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1300_ITest.java index b23f7531b4..cf7ff3f183 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1300_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1300_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1300_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1301_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1301_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1301_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1301_ITest.java index 4866de5fa9..6c946aa437 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1301_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1301_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1301_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1400_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1400_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1400_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1400_ITest.java index 5955914041..3bc70adc2a 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1400_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1400_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1400_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1500_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1500_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1500_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1500_ITest.java index 0059119e99..9038700232 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_1_MSD_1500_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_1_MSD_1500_ITest.java @@ -9,12 +9,12 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.core.IVendorMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_1_MSD_1500_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0701_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0701_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0701_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0701_ITest.java index 9f91b41e64..83e0a892d3 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0701_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0701_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_0701_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0801_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0801_ITest.java similarity index 97% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0801_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0801_ITest.java index 5dcb3f9f5b..fbc8b7240b 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0801_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0801_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_0801_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0802_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0802_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0802_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0802_ITest.java index 5d33a3dd6c..cfa122e74a 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0802_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0802_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_0802_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0803_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0803_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0803_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0803_ITest.java index 559aaeb2bd..3b52adde26 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0803_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0803_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_0803_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0901_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0901_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0901_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0901_ITest.java index 3474350fa5..7e8a44e262 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0901_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0901_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_0901_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0902_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0902_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0902_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0902_ITest.java index 588ece9929..d960956564 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0902_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0902_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_0902_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0903_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0903_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0903_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0903_ITest.java index d1b55ec59e..c0631367b7 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_0903_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_0903_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; /** * NOTE: diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1001_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1001_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1001_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1001_ITest.java index 8dc190adfb..f644459d87 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1001_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1001_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_1001_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1002_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1002_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1002_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1002_ITest.java index 86fdbeed45..33e2ccec4f 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1002_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1002_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_2_MSD_1002_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1003_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1003_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1003_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1003_ITest.java index acd97f5e76..46ad8f8571 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1003_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1003_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1003_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1004_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1004_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1004_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1004_ITest.java index b2a4bd92b0..c4b616df84 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1004_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1004_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1004_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1005_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1005_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1005_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1005_ITest.java index 7720cefa8e..9ef921b6e9 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1005_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1005_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1005_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1006_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1006_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1006_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1006_ITest.java index 86df012d9f..a7491f7e49 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1006_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1006_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1006_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1007_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1007_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1007_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1007_ITest.java index f895dda34a..7ffa98f211 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1007_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1007_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1007_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1100_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1100_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1100_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1100_ITest.java index 46b2f187ca..afa41a7f16 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1100_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1100_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1100_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1300_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1300_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1300_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1300_ITest.java index 880ac22ed4..b4893aaaa4 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1300_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1300_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1300_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1301_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1301_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1301_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1301_ITest.java index f5ea3dc23b..f55ed084f4 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1301_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1301_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1301_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1400_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1400_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1400_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1400_ITest.java index b017958ecc..4bc229dedc 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1400_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1400_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1400_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1500_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1500_ITest.java similarity index 98% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1500_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1500_ITest.java index 247d623943..5eb9addf7b 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_2_MSD_1500_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_2_MSD_1500_ITest.java @@ -9,13 +9,13 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.msd.model.core.IIonTransitionGroup; import org.eclipse.chemclipse.msd.model.core.IIonTransitionSettings; import org.eclipse.chemclipse.msd.model.core.IScanMSD; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; import org.eclipse.core.runtime.NullProgressMonitor; public class ChromatogramReader_2_MSD_1500_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1001_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1001_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1001_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1001_ITest.java index 4baac70825..3acb419b1a 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1001_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1001_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1001_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1002_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1002_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1002_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1002_ITest.java index 4575ad8bd6..336ccb5731 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1002_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1002_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1002_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1003_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1003_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1003_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1003_ITest.java index 6b602df2d3..ad6e882392 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1003_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1003_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1003_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1004_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1004_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1004_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1004_ITest.java index ed747d43fe..79c2ca9ec3 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1004_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1004_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1004_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1005_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1005_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1005_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1005_ITest.java index 172cbedc8b..69f9966879 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1005_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1005_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1005_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1006_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1006_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1006_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1006_ITest.java index fa4b320e1c..a33ad45539 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1006_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1006_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1006_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1007_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1007_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1007_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1007_ITest.java index f06a3d81e8..0d828eee9b 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1007_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1007_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1007_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1100_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1100_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1100_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1100_ITest.java index f725da8893..445210004f 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1100_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1100_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1100_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1300_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1300_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1300_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1300_ITest.java index c37bfc8c3e..11354b081c 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1300_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1300_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1300_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1301_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1301_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1301_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1301_ITest.java index 72df08da2d..2a2d49554c 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1301_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1301_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1301_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1400_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1400_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1400_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1400_ITest.java index 42ada74fbb..20dcf9f300 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1400_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1400_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1400_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1500_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1500_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1500_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1500_ITest.java index ebf820107f..8c2920faaa 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_FID_1500_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_FID_1500_ITest.java @@ -9,10 +9,10 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class ChromatogramReader_3_FID_1500_ITest extends ChromatogramReaderFIDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1001_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1001_ITest.java similarity index 91% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1001_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1001_ITest.java index 4f95862def..368bb68e32 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1001_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1001_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1001_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1002_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1002_ITest.java similarity index 91% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1002_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1002_ITest.java index ad33d313b1..93b37860c2 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1002_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1002_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1002_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1003_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1003_ITest.java similarity index 91% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1003_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1003_ITest.java index e4df2a2272..f171c4afb3 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1003_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1003_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1003_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1004_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1004_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1004_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1004_ITest.java index a8dcd6cfde..e6366e8564 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1004_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1004_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1004_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1005_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1005_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1005_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1005_ITest.java index cc6bf32337..f585784e96 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1005_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1005_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1005_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1006_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1006_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1006_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1006_ITest.java index 14773ea6f2..c13a8a9155 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1006_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1006_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1006_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1007_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1007_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1007_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1007_ITest.java index 115625db1b..ac400d4a99 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1007_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1007_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1007_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1100_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1100_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1100_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1100_ITest.java index cab6f06dd8..059c90a9d2 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1100_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1100_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1100_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1300_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1300_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1300_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1300_ITest.java index 8f91b0d3c4..a0ed370117 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1300_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1300_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1300_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1301_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1301_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1301_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1301_ITest.java index 53cbc2cf22..1e498d2633 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1301_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1301_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1301_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1400_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1400_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1400_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1400_ITest.java index 33e37cf997..f08cc46dc5 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1400_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1400_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1400_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1500_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1500_ITest.java similarity index 92% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1500_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1500_ITest.java index e3fa59979d..5108909361 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/ChromatogramReader_3_MSD_1500_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/ChromatogramReader_3_MSD_1500_ITest.java @@ -9,11 +9,11 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import org.eclipse.chemclipse.model.core.IScan; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier; public class ChromatogramReader_3_MSD_1500_ITest extends ChromatogramReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReaderMSDTestCase.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReaderMSDTestCase.java similarity index 96% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReaderMSDTestCase.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReaderMSDTestCase.java index 37eb09e3ab..6f799a9ff0 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReaderMSDTestCase.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReaderMSDTestCase.java @@ -10,7 +10,7 @@ * Dr. Philip Wenig - initial API and implementation * Alexander Kerner - Generics *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.io.File; diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0801_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0801_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0801_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0801_ITest.java index e8ff89a131..24f6879503 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0801_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0801_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_0801_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0802_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0802_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0802_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0802_ITest.java index ac7fd5e8e8..0725e1e040 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0802_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0802_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_0802_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0803_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0803_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0803_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0803_ITest.java index 1b46faf511..a77fc8a0ac 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0803_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0803_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_0803_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0901_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0901_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0901_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0901_ITest.java index d2718871dc..d3f84440a1 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0901_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0901_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_0901_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0902_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0902_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0902_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0902_ITest.java index 7dbce39222..ef2a49a3d1 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0902_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0902_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_0902_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0903_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0903_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0903_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0903_ITest.java index 5465c2fe42..71199a2033 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_0903_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_0903_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_0903_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1001_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1001_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1001_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1001_ITest.java index e860a276c5..868edf9867 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1001_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1001_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1001_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1002_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1002_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1002_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1002_ITest.java index 06aff8e18c..2157844148 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1002_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1002_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1002_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1003_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1003_ITest.java similarity index 93% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1003_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1003_ITest.java index 7037b2906a..de889eee12 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1003_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1003_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1003_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1004_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1004_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1004_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1004_ITest.java index c72f6142c8..7b906a84bf 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1004_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1004_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1004_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1005_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1005_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1005_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1005_ITest.java index 98955c49bf..615d2b88ca 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1005_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1005_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1005_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1006_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1006_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1006_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1006_ITest.java index bf7ae07dc6..e180701b65 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1006_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1006_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1006_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1007_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1007_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1007_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1007_ITest.java index 3319c1135e..2d73105400 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1007_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1007_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1007_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1100_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1100_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1100_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1100_ITest.java index d0e13973c8..701f937134 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1100_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1100_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1100_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1300_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1300_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1300_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1300_ITest.java index c67e32cf7d..c303317c12 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1300_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1300_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1300_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1301_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1301_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1301_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1301_ITest.java index e9e861fb1f..57f1fbfecc 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1301_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1301_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1301_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1400_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1400_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1400_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1400_ITest.java index f0e8411d35..7e7bb03c15 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1400_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1400_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1400_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1500_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1500_ITest.java similarity index 94% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1500_ITest.java rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1500_ITest.java index 93b62907dd..0b0a124518 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/chemclipse/io/PeakReader_1_MSD_1500_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/ocx/io/PeakReader_1_MSD_1500_ITest.java @@ -9,7 +9,7 @@ * Contributors: * Dr. Philip Wenig - initial API and implementation *******************************************************************************/ -package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.io; +package org.eclipse.chemclipse.xxd.converter.supplier.ocx.io; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.msd.model.core.IPeakMassSpectrum; -import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.TestPathHelper; +import org.eclipse.chemclipse.xxd.converter.supplier.ocx.TestPathHelper; public class PeakReader_1_MSD_1500_ITest extends PeakReaderMSDTestCase { diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/export/INFO.txt b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/export/INFO.txt similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/export/INFO.txt rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/export/INFO.txt diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0701.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0701.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0701.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0701.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0801.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0801.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0801.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0801.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0802.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0802.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0802.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0802.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0803.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0803.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0803.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0803.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0901.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0901.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0901.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0901.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0902.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0902.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0902.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0902.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0903.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0903.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-0903.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-0903.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1001.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1001.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1001.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1001.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1002.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1002.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1002.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1002.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1003.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1003.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1003.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1003.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1004.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1004.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1004.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1004.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1005.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1005.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1005.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1005.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1006.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1006.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1006.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1006.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1007.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1007.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1007.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1007.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1100.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1100.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1100.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1100.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1300.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1300.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1300.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1300.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1301.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1301.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1301.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1301.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1400.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1400.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1400.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1400.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1500.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1500.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram1-1500.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram1-1500.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0701.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0701.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0701.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0701.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0801.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0801.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0801.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0801.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0802.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0802.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0802.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0802.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0803.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0803.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0803.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0803.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0901.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0901.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0901.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0901.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0902.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0902.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0902.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0902.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0903.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0903.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-0903.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-0903.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1001.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1001.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1001.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1001.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1002.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1002.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1002.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1002.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1003.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1003.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1003.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1003.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1004.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1004.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1004.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1004.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1005.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1005.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1005.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1005.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1006.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1006.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1006.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1006.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1007.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1007.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1007.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1007.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1100.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1100.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1100.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1100.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1300.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1300.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1300.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1300.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1301.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1301.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1301.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1301.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1400.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1400.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1400.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1400.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1500.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1500.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram2-1500.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram2-1500.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1001.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1001.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1001.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1001.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1002.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1002.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1002.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1002.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1003.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1003.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1003.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1003.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1004.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1004.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1004.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1004.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1005.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1005.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1005.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1005.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1006.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1006.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1006.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1006.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1007.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1007.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1007.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1007.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1100.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1100.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1100.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1100.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1300.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1300.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1300.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1300.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1301.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1301.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1301.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1301.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1400.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1400.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1400.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1400.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1500.ocb b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1500.ocb similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/import/Chromatogram3-1500.ocb rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/import/Chromatogram3-1500.ocb diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/ChromIdentMethod.ocm b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/ChromIdentMethod.ocm similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/ChromIdentMethod.ocm rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/ChromIdentMethod.ocm diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/Format_v0.0.1.ocm b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/Format_v0.0.1.ocm similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/Format_v0.0.1.ocm rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/Format_v0.0.1.ocm diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/Format_v0.0.2.ocm b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/Format_v0.0.2.ocm similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/Format_v0.0.2.ocm rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/Format_v0.0.2.ocm diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/Format_v0.0.3.ocm b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/Format_v0.0.3.ocm similarity index 100% rename from chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.fragment.test/testData/files/methods/Format_v0.0.3.ocm rename to chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.ocx.fragment.test/testData/files/methods/Format_v0.0.3.ocm