diff --git a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.cml/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/converter/ScanImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.cml/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/converter/ScanImportConverter.java index 37152b3ef1..c0af44781d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.cml/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/converter/ScanImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.cml/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/converter/ScanImportConverter.java @@ -20,15 +20,15 @@ import org.eclipse.chemclipse.vsd.converter.core.IScanImportConverter; import org.eclipse.chemclipse.vsd.converter.supplier.cml.io.ScanReader; import org.eclipse.chemclipse.vsd.converter.supplier.cml.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.IProgressMonitor; -@SuppressWarnings("rawtypes") public class ScanImportConverter extends AbstractScanImportConverter implements IScanImportConverter { @Override - public IProcessingInfo convert(File file, IProgressMonitor monitor) { + public IProcessingInfo convert(File file, IProgressMonitor monitor) { - IProcessingInfo processingInfo = new ProcessingInfo<>(); + IProcessingInfo processingInfo = new ProcessingInfo<>(); IVendorSpectrumVSD vendorScan = null; ScanReader scanReader = new ScanReader(); vendorScan = scanReader.read(file, monitor); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.csv/src/org/eclipse/chemclipse/vsd/converter/supplier/csv/core/ScanImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.csv/src/org/eclipse/chemclipse/vsd/converter/supplier/csv/core/ScanImportConverter.java index 0e9eb4bf4e..2aa8b86a23 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.csv/src/org/eclipse/chemclipse/vsd/converter/supplier/csv/core/ScanImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter.supplier.csv/src/org/eclipse/chemclipse/vsd/converter/supplier/csv/core/ScanImportConverter.java @@ -21,17 +21,17 @@ import org.eclipse.chemclipse.vsd.converter.core.IScanImportConverter; import org.eclipse.chemclipse.vsd.converter.supplier.csv.io.ScanReader; import org.eclipse.chemclipse.vsd.converter.supplier.csv.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.IProgressMonitor; -@SuppressWarnings("rawtypes") public class ScanImportConverter extends AbstractScanImportConverter implements IScanImportConverter { private static final Logger logger = Logger.getLogger(ScanImportConverter.class); @Override - public IProcessingInfo convert(File file, IProgressMonitor monitor) { + public IProcessingInfo convert(File file, IProgressMonitor monitor) { - IProcessingInfo processingInfo = new ProcessingInfo<>(); + IProcessingInfo processingInfo = new ProcessingInfo<>(); try { ScanReader scanReader = new ScanReader(); IVendorSpectrumVSD vendorScan = scanReader.read(file, monitor); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/AbstractScanImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/AbstractScanImportConverter.java index b60ebd09e5..ef98417cfe 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/AbstractScanImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/AbstractScanImportConverter.java @@ -13,6 +13,5 @@ import org.eclipse.chemclipse.converter.core.AbstractImportConverter; -@SuppressWarnings("rawtypes") public abstract class AbstractScanImportConverter extends AbstractImportConverter implements IScanImportConverter { } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/IScanImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/IScanImportConverter.java index e447dfb971..b99b206de1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/IScanImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/IScanImportConverter.java @@ -16,9 +16,10 @@ import org.eclipse.chemclipse.converter.core.IImportConverter; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.IProgressMonitor; -public interface IScanImportConverter extends IImportConverter { +public interface IScanImportConverter extends IImportConverter { - IProcessingInfo convert(File file, IProgressMonitor monitor); + IProcessingInfo convert(File file, IProgressMonitor monitor); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/ScanConverterVSD.java b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/ScanConverterVSD.java index eb0e285d82..a2d10c524e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/ScanConverterVSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.vsd.converter/src/org/eclipse/chemclipse/vsd/converter/core/ScanConverterVSD.java @@ -54,7 +54,7 @@ public static IProcessingInfo convert(final File file, final Strin * Do not use a safe runnable here, because an object must * be returned or null. */ - IScanImportConverter importConverter = getScanImportConverter(converterId); + IScanImportConverter importConverter = getScanImportConverter(converterId); if(importConverter != null) { processingInfo = importConverter.convert(file, monitor); } else { @@ -87,7 +87,7 @@ private static IProcessingInfo getScan(final File file, IProgressM * Do not use a safe runnable here, because an object must * be returned or null. */ - IScanImportConverter importConverter = getScanImportConverter(converterId); + IScanImportConverter importConverter = getScanImportConverter(converterId); if(importConverter != null) { processingInfo = importConverter.convert(file, monitor); if(!processingInfo.hasErrorMessages()) { @@ -117,15 +117,14 @@ public static IProcessingInfo convert(final File file, final ISpectrumVSD return processingInfo; } - @SuppressWarnings("unchecked") - private static IScanImportConverter getScanImportConverter(final String converterId) { + private static IScanImportConverter getScanImportConverter(final String converterId) { IConfigurationElement element; element = getConfigurationElement(converterId); - IScanImportConverter instance = null; + IScanImportConverter instance = null; if(element != null) { try { - instance = (IScanImportConverter)element.createExecutableExtension(Converter.IMPORT_CONVERTER); + instance = (IScanImportConverter)element.createExecutableExtension(Converter.IMPORT_CONVERTER); } catch(CoreException e) { logger.error(e); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx/src/org/eclipse/chemclipse/vsd/converter/supplier/jcampdx/converter/ScanImportConverter.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx/src/org/eclipse/chemclipse/vsd/converter/supplier/jcampdx/converter/ScanImportConverter.java index b3f69e3a5e..38e60319f1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx/src/org/eclipse/chemclipse/vsd/converter/supplier/jcampdx/converter/ScanImportConverter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx/src/org/eclipse/chemclipse/vsd/converter/supplier/jcampdx/converter/ScanImportConverter.java @@ -21,17 +21,17 @@ import org.eclipse.chemclipse.vsd.converter.core.IScanImportConverter; import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.io.ScanReader; import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.IProgressMonitor; -@SuppressWarnings("rawtypes") public class ScanImportConverter extends AbstractScanImportConverter implements IScanImportConverter { private static final Logger logger = Logger.getLogger(ScanImportConverter.class); @Override - public IProcessingInfo convert(File file, IProgressMonitor monitor) { + public IProcessingInfo convert(File file, IProgressMonitor monitor) { - IProcessingInfo processingInfo = new ProcessingInfo<>(); + IProcessingInfo processingInfo = new ProcessingInfo<>(); try { ScanReader scanReader = new ScanReader(); IVendorSpectrumVSD vendorScan = scanReader.read(file, monitor); diff --git a/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/But2_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/But2_ITest.java index 5169f6a208..583111a016 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/But2_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/But2_ITest.java @@ -17,6 +17,7 @@ import org.eclipse.chemclipse.vsd.converter.supplier.cml.PathResolver; import org.eclipse.chemclipse.vsd.converter.supplier.cml.converter.ScanImportConverter; import org.eclipse.chemclipse.vsd.converter.supplier.cml.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Test; @@ -24,7 +25,7 @@ public class But2_ITest extends TestCase { - private IVendorSpectrumVSD vendorSpectrum; + private ISpectrumVSD spectrumVSD; @Override protected void setUp() throws Exception { @@ -32,30 +33,32 @@ protected void setUp() throws Exception { super.setUp(); File file = new File(PathResolver.getAbsolutePath(TestPathHelper.BUT2)); ScanImportConverter importConverter = new ScanImportConverter(); - IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); - vendorSpectrum = processingInfo.getProcessingResult(); + IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); + spectrumVSD = processingInfo.getProcessingResult(); } @Override protected void tearDown() throws Exception { - vendorSpectrum = null; + spectrumVSD = null; super.tearDown(); } @Test public void testLoading() { - assertNotNull(vendorSpectrum); - assertEquals("2-Butanol", vendorSpectrum.getSampleName()); - assertEquals("but2", vendorSpectrum.getDataName()); - assertEquals("C 4 H 10 O 1", vendorSpectrum.getFormula()); - assertEquals("78-92-2", vendorSpectrum.getCasNumber()); + assertNotNull(spectrumVSD); + assertEquals("2-Butanol", spectrumVSD.getSampleName()); + assertEquals("but2", spectrumVSD.getDataName()); + if(spectrumVSD instanceof IVendorSpectrumVSD vendorSpectrumVSD) { + assertEquals("C 4 H 10 O 1", vendorSpectrumVSD.getFormula()); + assertEquals("78-92-2", vendorSpectrumVSD.getCasNumber()); + } } @Test public void testSignals() { - assertEquals(224, vendorSpectrum.getScanVSD().getProcessedSignals().size()); + assertEquals(224, spectrumVSD.getScanVSD().getProcessedSignals().size()); } } diff --git a/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/PCLANIL_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/PCLANIL_ITest.java index 46623c7d43..ad98df5f18 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/PCLANIL_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.vsd.converter.supplier.cml.test/src/org/eclipse/chemclipse/vsd/converter/supplier/cml/test/PCLANIL_ITest.java @@ -18,6 +18,7 @@ import org.eclipse.chemclipse.vsd.converter.supplier.cml.PathResolver; import org.eclipse.chemclipse.vsd.converter.supplier.cml.converter.ScanImportConverter; import org.eclipse.chemclipse.vsd.converter.supplier.cml.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Test; @@ -25,7 +26,7 @@ public class PCLANIL_ITest extends TestCase { - private IVendorSpectrumVSD vendorSpectrum; + private ISpectrumVSD spectrumVSD; @Override protected void setUp() throws Exception { @@ -33,31 +34,33 @@ protected void setUp() throws Exception { super.setUp(); File file = new File(PathResolver.getAbsolutePath(TestPathHelper.PCLANIL)); ScanImportConverter importConverter = new ScanImportConverter(); - IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); - vendorSpectrum = processingInfo.getProcessingResult(); + IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); + spectrumVSD = processingInfo.getProcessingResult(); } @Override protected void tearDown() throws Exception { - vendorSpectrum = null; + spectrumVSD = null; super.tearDown(); } @Test public void testLoading() { - assertNotNull(vendorSpectrum); - assertEquals("para-chloroaniline", vendorSpectrum.getSampleName()); - assertEquals("IR_para-chlor", vendorSpectrum.getDataName()); - assertEquals("C6H6ClN", vendorSpectrum.getFormula()); - assertEquals("106-47-8", vendorSpectrum.getCasNumber()); - assertEquals("PERKIN-ELMER 1000 FT-IR", vendorSpectrum.getInstrument()); + assertNotNull(spectrumVSD); + assertEquals("para-chloroaniline", spectrumVSD.getSampleName()); + assertEquals("IR_para-chlor", spectrumVSD.getDataName()); + assertEquals("PERKIN-ELMER 1000 FT-IR", spectrumVSD.getInstrument()); + if(spectrumVSD instanceof IVendorSpectrumVSD vendorSpectrumVSD) { + assertEquals("C6H6ClN", vendorSpectrumVSD.getFormula()); + assertEquals("106-47-8", vendorSpectrumVSD.getCasNumber()); + } } @Test public void testSignals() { - assertEquals(1801, vendorSpectrum.getScanVSD().getProcessedSignals().size()); + assertEquals(1801, spectrumVSD.getScanVSD().getProcessedSignals().size()); } } \ No newline at end of file diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedDecrease1_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedDecrease1_ITest.java index a06df47cf2..e937c4df1d 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedDecrease1_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedDecrease1_ITest.java @@ -15,7 +15,7 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.converter.ScanImportConverter; -import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Test; @@ -23,7 +23,7 @@ public class FixedDecrease1_ITest extends TestCase { - private IVendorSpectrumVSD vendorSpectrum; + private ISpectrumVSD spectrumVSD; @Override protected void setUp() throws Exception { @@ -31,26 +31,26 @@ protected void setUp() throws Exception { super.setUp(); File file = new File(PathResolver.getAbsolutePath(TestPathHelper.FIXDEC1)); ScanImportConverter importConverter = new ScanImportConverter(); - IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); - vendorSpectrum = processingInfo.getProcessingResult(); + IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); + spectrumVSD = processingInfo.getProcessingResult(); } @Override protected void tearDown() throws Exception { - vendorSpectrum = null; + spectrumVSD = null; super.tearDown(); } @Test public void testLoading() { - assertNotNull(vendorSpectrum); + assertNotNull(spectrumVSD); } @Test public void testSignals() { - assertEquals(3951, vendorSpectrum.getScanVSD().getProcessedSignals().size()); + assertEquals(3951, spectrumVSD.getScanVSD().getProcessedSignals().size()); } } \ No newline at end of file diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease1_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease1_ITest.java index 42d65a3bbd..7ab51f162d 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease1_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease1_ITest.java @@ -15,7 +15,7 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.converter.ScanImportConverter; -import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Test; @@ -23,7 +23,7 @@ public class FixedIncrease1_ITest extends TestCase { - private IVendorSpectrumVSD vendorSpectrum; + private ISpectrumVSD spectrumVSD; @Override protected void setUp() throws Exception { @@ -31,26 +31,26 @@ protected void setUp() throws Exception { super.setUp(); File file = new File(PathResolver.getAbsolutePath(TestPathHelper.FIXINC1)); ScanImportConverter importConverter = new ScanImportConverter(); - IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); - vendorSpectrum = processingInfo.getProcessingResult(); + IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); + spectrumVSD = processingInfo.getProcessingResult(); } @Override protected void tearDown() throws Exception { - vendorSpectrum = null; + spectrumVSD = null; super.tearDown(); } @Test public void testLoading() { - assertNotNull(vendorSpectrum); + assertNotNull(spectrumVSD); } @Test public void testSignals() { - assertEquals(3736, vendorSpectrum.getScanVSD().getProcessedSignals().size()); + assertEquals(3736, spectrumVSD.getScanVSD().getProcessedSignals().size()); } } \ No newline at end of file diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease2_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease2_ITest.java index a6f504e9b4..fde17788de 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease2_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/FixedIncrease2_ITest.java @@ -15,7 +15,7 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.converter.ScanImportConverter; -import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Test; @@ -23,7 +23,7 @@ public class FixedIncrease2_ITest extends TestCase { - private IVendorSpectrumVSD vendorSpectrum; + private ISpectrumVSD spectrumVSD; @Override protected void setUp() throws Exception { @@ -31,26 +31,26 @@ protected void setUp() throws Exception { super.setUp(); File file = new File(PathResolver.getAbsolutePath(TestPathHelper.FIXINC2)); ScanImportConverter importConverter = new ScanImportConverter(); - IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); - vendorSpectrum = processingInfo.getProcessingResult(); + IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); + spectrumVSD = processingInfo.getProcessingResult(); } @Override protected void tearDown() throws Exception { - vendorSpectrum = null; + spectrumVSD = null; super.tearDown(); } @Test public void testLoading() { - assertNotNull(vendorSpectrum); + assertNotNull(spectrumVSD); } @Test public void testSignals() { - assertEquals(3601, vendorSpectrum.getScanVSD().getProcessedSignals().size()); + assertEquals(3601, spectrumVSD.getScanVSD().getProcessedSignals().size()); } } \ No newline at end of file diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/JCAMPTestPolys_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/JCAMPTestPolys_ITest.java index 84fd474ef5..70a7389d60 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/JCAMPTestPolys_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/JCAMPTestPolys_ITest.java @@ -15,7 +15,7 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.converter.ScanImportConverter; -import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Test; @@ -23,7 +23,7 @@ public class JCAMPTestPolys_ITest extends TestCase { - private IVendorSpectrumVSD vendorSpectrum; + private ISpectrumVSD spectrumVSD; @Override protected void setUp() throws Exception { @@ -31,26 +31,26 @@ protected void setUp() throws Exception { super.setUp(); File file = new File(PathResolver.getAbsolutePath(TestPathHelper.JTPOLYS)); ScanImportConverter importConverter = new ScanImportConverter(); - IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); - vendorSpectrum = processingInfo.getProcessingResult(); + IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); + spectrumVSD = processingInfo.getProcessingResult(); } @Override protected void tearDown() throws Exception { - vendorSpectrum = null; + spectrumVSD = null; super.tearDown(); } @Test public void testLoading() { - assertNotNull(vendorSpectrum); + assertNotNull(spectrumVSD); } @Test public void testSignals() { - assertEquals(1844, vendorSpectrum.getScanVSD().getProcessedSignals().size()); + assertEquals(1844, spectrumVSD.getScanVSD().getProcessedSignals().size()); } } \ No newline at end of file diff --git a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/PacDecreasing_ITest.java b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/PacDecreasing_ITest.java index 60d5022f56..24298392ce 100644 --- a/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/PacDecreasing_ITest.java +++ b/chemclipse/tests/org.eclipse.chemclipse.xxd.converter.supplier.jcampdx.fragment.test/src/org/eclipse/chemclipse/xxd/converter/supplier/jcampdx/PacDecreasing_ITest.java @@ -15,7 +15,7 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.converter.ScanImportConverter; -import org.eclipse.chemclipse.vsd.converter.supplier.jcampdx.model.IVendorSpectrumVSD; +import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD; import org.eclipse.core.runtime.NullProgressMonitor; import org.junit.Test; @@ -23,7 +23,7 @@ public class PacDecreasing_ITest extends TestCase { - private IVendorSpectrumVSD vendorSpectrum; + private ISpectrumVSD spectrumVSD; @Override protected void setUp() throws Exception { @@ -31,26 +31,26 @@ protected void setUp() throws Exception { super.setUp(); File file = new File(PathResolver.getAbsolutePath(TestPathHelper.PACDEC1)); ScanImportConverter importConverter = new ScanImportConverter(); - IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); - vendorSpectrum = processingInfo.getProcessingResult(); + IProcessingInfo processingInfo = importConverter.convert(file, new NullProgressMonitor()); + spectrumVSD = processingInfo.getProcessingResult(); } @Override protected void tearDown() throws Exception { - vendorSpectrum = null; + spectrumVSD = null; super.tearDown(); } @Test public void testLoading() { - assertNotNull(vendorSpectrum); + assertNotNull(spectrumVSD); } @Test public void testSignals() { - assertEquals(3301, vendorSpectrum.getScanVSD().getProcessedSignals().size()); + assertEquals(3301, spectrumVSD.getScanVSD().getProcessedSignals().size()); } } \ No newline at end of file