Skip to content

Commit 06cebac

Browse files
Mailaendereselmeister
Mailaender
authored and
eselmeister
committed
Avoid path resolver.
1 parent b516692 commit 06cebac

File tree

90 files changed

+93
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+93
-273
lines changed

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CAL_3_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class CAL_3_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.CAL_3);
39+
File file = new File(TestPathHelper.CAL_3);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASS10_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class CLASS10_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.CLASS10);
39+
File file = new File(TestPathHelper.CLASS10);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/CLASSVP_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class CLASSVP_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.CLASSVP);
39+
File file = new File(TestPathHelper.CLASSVP);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DIONEX_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class DIONEX_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.DIONEX);
39+
File file = new File(TestPathHelper.DIONEX);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/DNX_7AN_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class DNX_7AN_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.DNX_7AN);
39+
File file = new File(TestPathHelper.DNX_7AN);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE1_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class EXAMPLE1_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.EXAMPLE1);
39+
File file = new File(TestPathHelper.EXAMPLE1);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/EXAMPLE_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class EXAMPLE_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.EXAMPLE);
39+
File file = new File(TestPathHelper.EXAMPLE);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PCB_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class PCB_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.PCB);
39+
File file = new File(TestPathHelper.PCB);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/PK_SUM01N01_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class PK_SUM01N01_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.PK_SUM01N01);
39+
File file = new File(TestPathHelper.PK_SUM01N01);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

‎openchrom/tests/net.openchrom.csd.converter.supplier.cdf.fragment.test/src/net/openchrom/csd/converter/supplier/cdf/SHIMADZU_ITest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
import java.io.File;
1919
import java.io.IOException;
2020

21-
import org.eclipse.chemclipse.converter.PathResolver;
2221
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
2322
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
2423
import org.eclipse.core.runtime.NullProgressMonitor;
2524
import org.junit.jupiter.api.BeforeAll;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
2827
import org.junit.jupiter.api.TestInstance.Lifecycle;
29-
import org.osgi.framework.FrameworkUtil;
3028

3129
import net.openchrom.csd.converter.supplier.cdf.converter.ChromatogramImportConverterCSD;
3230

@@ -38,7 +36,7 @@ public class SHIMADZU_ITest {
3836
@BeforeAll
3937
public void setUp() throws IOException {
4038

41-
File file = PathResolver.getFile(FrameworkUtil.getBundle(getClass()), TestPathHelper.SHIMADZU);
39+
File file = new File(TestPathHelper.SHIMADZU);
4240
ChromatogramImportConverterCSD importConverter = new ChromatogramImportConverterCSD();
4341
IProcessingInfo<IChromatogramCSD> processingInfo = importConverter.convert(file, new NullProgressMonitor());
4442
chromatogram = processingInfo.getProcessingResult();

0 commit comments

Comments
 (0)