diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/META-INF/MANIFEST.MF b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/META-INF/MANIFEST.MF index 0c04566e46..b0f3250a5a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/META-INF/MANIFEST.MF +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.chemclipse.model;bundle-version="0.8.0", org.eclipse.chemclipse.csd.model;bundle-version="0.8.0", org.eclipse.chemclipse.processing;bundle-version="0.8.0", - org.eclipse.chemclipse.logging;bundle-version="0.8.0" + org.eclipse.chemclipse.logging;bundle-version="0.8.0", + org.eclipse.chemclipse.support;bundle-version="0.9.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.chemclipse.chromatogram.csd.identifier.impl, diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/AbstractPeakIdentifierCSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/AbstractPeakIdentifierCSD.java index 0a126b1222..676232a68e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/AbstractPeakIdentifierCSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/AbstractPeakIdentifierCSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2019 Lablicate GmbH. + * Copyright (c) 2018, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -12,12 +12,18 @@ *******************************************************************************/ package org.eclipse.chemclipse.chromatogram.csd.identifier.peak; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.chemclipse.chromatogram.csd.identifier.settings.IIdentifierSettingsCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; import org.eclipse.chemclipse.model.exceptions.ValueMustNotBeNullException; +import org.eclipse.chemclipse.support.literature.LiteratureReference; public abstract class AbstractPeakIdentifierCSD implements IPeakIdentifierCSD { + private List literatureReferences = new ArrayList<>(); + /** * Validates that the peak is not null.
* If yes, an exception will be thrown. @@ -44,4 +50,10 @@ public void validateSettings(IIdentifierSettingsCSD identifierSettings) throws V throw new ValueMustNotBeNullException("The identifier settings must not be null."); } } + + @Override + public List getLiteratureReferences() { + + return literatureReferences; + } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/IPeakIdentifierCSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/IPeakIdentifierCSD.java index c38aff3d1a..515605e385 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/IPeakIdentifierCSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/IPeakIdentifierCSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -17,6 +17,7 @@ import org.eclipse.chemclipse.chromatogram.csd.identifier.settings.IPeakIdentifierSettingsCSD; import org.eclipse.chemclipse.csd.model.core.IPeakCSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.support.literature.LiteratureReference; import org.eclipse.core.runtime.IProgressMonitor; public interface IPeakIdentifierCSD { @@ -30,4 +31,6 @@ public interface IPeakIdentifierCSD { * @return {@link IProcessingInfo} */ IProcessingInfo identify(List peaks, IPeakIdentifierSettingsCSD peakIdentifierSettings, IProgressMonitor monitor); + + List getLiteratureReferences(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSD.java index 92a8ec704d..e1c8040ba6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2023 Lablicate GmbH. + * Copyright (c) 2008, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -125,6 +125,7 @@ public static IPeakIdentifierSupportCSD getPeakIdentifierSupport() { try { IPeakIdentifierSettingsCSD instance = (IPeakIdentifierSettingsCSD)element.createExecutableExtension(Identifier.IDENTIFIER_SETTINGS); supplier.setIdentifierSettingsClass(instance.getClass()); + supplier.getLiteratureReferences().addAll(instance.getLiteratureReferences()); } catch(CoreException e) { logger.error(e); // settings class is optional, set null instead diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSDProcessTypeSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSDProcessTypeSupplier.java index 912c816948..1c40f1112a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSDProcessTypeSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.csd.identifier/src/org/eclipse/chemclipse/chromatogram/csd/identifier/peak/PeakIdentifierCSDProcessTypeSupplier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Lablicate GmbH. + * Copyright (c) 2019, 2024 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -64,6 +64,7 @@ private static final class PeakIdentifierProcessorSupplier extends ChromatogramS public PeakIdentifierProcessorSupplier(IPeakIdentifierSupplierCSD supplier, IProcessTypeSupplier parent) { super("PeakIdentifierCSD." + supplier.getId(), supplier.getIdentifierName(), supplier.getDescription(), (Class)supplier.getSettingsClass(), parent, DataType.CSD); //$NON-NLS-1$ + getLiteratureReferences().addAll(supplier.getLiteratureReferences()); this.supplier = supplier; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/IPeakIdentifierSupplierMSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/IPeakIdentifierSupplierMSD.java index 33c27b97c1..73774f7f55 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/IPeakIdentifierSupplierMSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/IPeakIdentifierSupplierMSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2018 Lablicate GmbH. + * Copyright (c) 2008, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -12,11 +12,16 @@ *******************************************************************************/ package org.eclipse.chemclipse.chromatogram.msd.identifier.peak; +import java.util.List; + import org.eclipse.chemclipse.chromatogram.msd.identifier.settings.IPeakIdentifierSettingsMSD; import org.eclipse.chemclipse.model.identifier.core.ISupplier; +import org.eclipse.chemclipse.support.literature.LiteratureReference; public interface IPeakIdentifierSupplierMSD extends ISupplier { @Override Class getSettingsClass(); + + List getLiteratureReferences(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSD.java index df90e3fd36..58274aef1f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2022 Lablicate GmbH. + * Copyright (c) 2008, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -127,6 +127,7 @@ public static IPeakIdentifierSupportMSD getPeakIdentifierSupport() { try { IPeakIdentifierSettingsMSD instance = (IPeakIdentifierSettingsMSD)element.createExecutableExtension(Identifier.IDENTIFIER_SETTINGS); supplier.setIdentifierSettingsClass(instance.getClass()); + supplier.getLiteratureReferences().addAll(instance.getLiteratureReferences()); } catch(CoreException e) { logger.warn(e); // settings class is optional, set null instead diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSDProcessTypeSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSDProcessTypeSupplier.java index bccbb509e6..6138c450ad 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSDProcessTypeSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.msd.identifier/src/org/eclipse/chemclipse/chromatogram/msd/identifier/peak/PeakIdentifierMSDProcessTypeSupplier.java @@ -63,6 +63,7 @@ private static final class PeakIdentifierProcessorSupplier extends ChromatogramS public PeakIdentifierProcessorSupplier(IPeakIdentifierSupplierMSD supplier, IProcessTypeSupplier parent) { super("PeakIdentifierMSD." + supplier.getId(), supplier.getIdentifierName(), supplier.getDescription(), (Class)supplier.getSettingsClass(), parent, DataType.MSD); + getLiteratureReferences().addAll(supplier.getLiteratureReferences()); this.supplier = supplier; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/AbstractPeakIdentifierWSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/AbstractPeakIdentifierWSD.java index 3e33c6d8dd..99b7354d03 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/AbstractPeakIdentifierWSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/AbstractPeakIdentifierWSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2021 Lablicate GmbH. + * Copyright (c) 2018, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -12,12 +12,18 @@ *******************************************************************************/ package org.eclipse.chemclipse.chromatogram.wsd.identifier.peak; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.chemclipse.chromatogram.wsd.identifier.settings.IIdentifierSettingsWSD; import org.eclipse.chemclipse.model.exceptions.ValueMustNotBeNullException; +import org.eclipse.chemclipse.support.literature.LiteratureReference; import org.eclipse.chemclipse.wsd.model.core.IPeakWSD; public abstract class AbstractPeakIdentifierWSD implements IPeakIdentifierWSD { + private List literatureReferences = new ArrayList<>(); + /** * Validates that the peak is not null.
* If yes, an exception will be thrown. @@ -44,4 +50,10 @@ public void validateSettings(IIdentifierSettingsWSD identifierSettings) throws V throw new ValueMustNotBeNullException("The identifier settings must not be null."); } } + + @Override + public List getLiteratureReferences() { + + return literatureReferences; + } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/IPeakIdentifierWSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/IPeakIdentifierWSD.java index e6ae1f595a..60a7653db5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/IPeakIdentifierWSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/IPeakIdentifierWSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2021 Lablicate GmbH. + * Copyright (c) 2018, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -16,6 +16,7 @@ import org.eclipse.chemclipse.chromatogram.wsd.identifier.settings.IPeakIdentifierSettingsWSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.support.literature.LiteratureReference; import org.eclipse.chemclipse.wsd.model.core.IPeakWSD; import org.eclipse.core.runtime.IProgressMonitor; @@ -30,4 +31,6 @@ public interface IPeakIdentifierWSD { * @return {@link IProcessingInfo} */ IProcessingInfo identify(List peaks, IPeakIdentifierSettingsWSD peakIdentifierSettings, IProgressMonitor monitor); + + List getLiteratureReferences(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSD.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSD.java index fa6426520a..9637e160bb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2023 Lablicate GmbH. + * Copyright (c) 2008, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -124,6 +124,7 @@ public static IPeakIdentifierSupportWSD getPeakIdentifierSupport() { try { IPeakIdentifierSettingsWSD instance = (IPeakIdentifierSettingsWSD)element.createExecutableExtension(Identifier.IDENTIFIER_SETTINGS); supplier.setIdentifierSettingsClass(instance.getClass()); + supplier.getLiteratureReferences().addAll(instance.getLiteratureReferences()); } catch(CoreException e) { logger.error(e); // settings class is optional, set null instead diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSDProcessTypeSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSDProcessTypeSupplier.java index a74d10976c..dfb7a548eb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSDProcessTypeSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.wsd.identifier/src/org/eclipse/chemclipse/chromatogram/wsd/identifier/peak/PeakIdentifierWSDProcessTypeSupplier.java @@ -63,6 +63,7 @@ private static final class PeakIdentifierProcessorSupplier extends ChromatogramS public PeakIdentifierProcessorSupplier(IPeakIdentifierSupplierWSD supplier, IProcessTypeSupplier parent) { super("PeakIdentifierWSD." + supplier.getId(), supplier.getIdentifierName(), supplier.getDescription(), (Class)supplier.getSettingsClass(), parent, DataType.WSD); + getLiteratureReferences().addAll(supplier.getLiteratureReferences()); this.supplier = supplier; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/core/PeakIdentifierUnknown.java b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/core/PeakIdentifierUnknown.java index dc53257347..5fe933275e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/core/PeakIdentifierUnknown.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.chromatogram.xxd.identifier.supplier.file/src/org/eclipse/chemclipse/chromatogram/xxd/identifier/supplier/file/core/PeakIdentifierUnknown.java @@ -32,6 +32,7 @@ import org.eclipse.chemclipse.msd.model.core.IPeakMSD; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; +import org.eclipse.chemclipse.support.literature.LiteratureReference; import org.eclipse.chemclipse.wsd.model.core.IPeakWSD; import org.eclipse.core.runtime.IProgressMonitor; @@ -89,4 +90,10 @@ private IProcessingInfo runIdentification(List getLiteratureReferences() { + + return null; + } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/AbstractSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/AbstractSupplier.java index 57b2db7537..adf75584cf 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/AbstractSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/AbstractSupplier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2018 Lablicate GmbH. + * Copyright (c) 2008, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -12,7 +12,11 @@ *******************************************************************************/ package org.eclipse.chemclipse.model.identifier.core; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.chemclipse.model.identifier.IIdentifierSettings; +import org.eclipse.chemclipse.support.literature.LiteratureReference; public abstract class AbstractSupplier implements ISupplierSetter { @@ -20,6 +24,7 @@ public abstract class AbstractSupplier implements private String id = ""; private String identifierName = ""; private Class identifierSettingsClass; + private List literatureReference = new ArrayList<>(); @Override public boolean equals(final Object otherObject) { @@ -95,6 +100,12 @@ public void setIdentifierSettingsClass(Class identifierSettingsClas this.identifierSettingsClass = identifierSettingsClass; } + @Override + public List getLiteratureReferences() { + + return literatureReference; + } + @Override public String toString() { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/ISupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/ISupplier.java index 888816a242..37cf4e0036 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/ISupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/core/ISupplier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2024 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -11,7 +11,10 @@ *******************************************************************************/ package org.eclipse.chemclipse.model.identifier.core; +import java.util.List; + import org.eclipse.chemclipse.model.identifier.IIdentifierSettings; +import org.eclipse.chemclipse.support.literature.LiteratureReference; public interface ISupplier { @@ -43,4 +46,6 @@ public interface ISupplier { * @return */ Class getSettingsClass(); + + List getLiteratureReferences(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.pubchem/src/org/eclipse/chemclipse/xxd/identifier/supplier/pubchem/identifier/PubChemExternalTargetIdentifier.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.pubchem/src/org/eclipse/chemclipse/xxd/identifier/supplier/pubchem/identifier/PubChemExternalTargetIdentifier.java index e39984c121..54f77bd8af 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.pubchem/src/org/eclipse/chemclipse/xxd/identifier/supplier/pubchem/identifier/PubChemExternalTargetIdentifier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.pubchem/src/org/eclipse/chemclipse/xxd/identifier/supplier/pubchem/identifier/PubChemExternalTargetIdentifier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Lablicate GmbH. + * Copyright (c) 2023, 2024 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -21,6 +21,7 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.identifier.IIdentifierSettings; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; +import org.eclipse.chemclipse.support.literature.LiteratureReference; import org.eclipse.chemclipse.xxd.identifier.supplier.pubchem.rest.PowerUserGateway; public class PubChemExternalTargetIdentifier implements ITargetIdentifierSupplier { @@ -70,4 +71,10 @@ public URL getURL(ILibraryInformation libraryInformation) { } return url; } + + @Override + public List getLiteratureReferences() { + + return null; + } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.wikidata/src/org/eclipse/chemclipse/xxd/identifier/supplier/wikidata/identifier/WikidataExternalTargetIdentifier.java b/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.wikidata/src/org/eclipse/chemclipse/xxd/identifier/supplier/wikidata/identifier/WikidataExternalTargetIdentifier.java index ba0d29d4c8..6301e9a7de 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.wikidata/src/org/eclipse/chemclipse/xxd/identifier/supplier/wikidata/identifier/WikidataExternalTargetIdentifier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.wikidata/src/org/eclipse/chemclipse/xxd/identifier/supplier/wikidata/identifier/WikidataExternalTargetIdentifier.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Lablicate GmbH. + * Copyright (c) 2023, 2024 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -15,12 +15,14 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.util.List; import org.eclipse.chemclipse.chromatogram.xxd.identifier.targets.ITargetIdentifierSupplier; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.cas.CasSupport; import org.eclipse.chemclipse.model.identifier.IIdentifierSettings; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; +import org.eclipse.chemclipse.support.literature.LiteratureReference; import org.eclipse.chemclipse.xxd.identifier.supplier.wikidata.query.QueryEntity; public class WikidataExternalTargetIdentifier implements ITargetIdentifierSupplier { @@ -76,4 +78,10 @@ public URL getURL(ILibraryInformation libraryInformation) { } return null; } + + @Override + public List getLiteratureReferences() { + + return null; + } }