From 07ba2250b13abd67b0109a5ccb7c73bfc7d90801 Mon Sep 17 00:00:00 2001 From: Philip Wenig Date: Wed, 16 Nov 2022 21:53:09 +0100 Subject: [PATCH] Fixed #1190 - ILibraryInformation - add index field --- .../identifier/AbstractLibraryInformation.java | 14 ++++++++++++++ .../model/identifier/ILibraryInformation.java | 14 ++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/AbstractLibraryInformation.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/AbstractLibraryInformation.java index c08e5f8efc..e6353c7b9b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/AbstractLibraryInformation.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/AbstractLibraryInformation.java @@ -42,6 +42,7 @@ public abstract class AbstractLibraryInformation implements ILibraryInformation private double molWeight = 0.0d; private double exactMass = 0.0d; private String database = ""; + private int databaseIndex = -1; private String contributor = ""; private String hit; private final Set classification = new LinkedHashSet<>(); @@ -83,6 +84,7 @@ public AbstractLibraryInformation(ILibraryInformation libraryInformation) { molWeight = libraryInformation.getMolWeight(); exactMass = libraryInformation.getExactMass(); database = libraryInformation.getDatabase(); + databaseIndex = libraryInformation.getDatabaseIndex(); contributor = libraryInformation.getContributor(); hit = libraryInformation.getHit(); classification.addAll(libraryInformation.getClassifier()); @@ -308,6 +310,18 @@ public void setDatabase(String database) { } } + @Override + public int getDatabaseIndex() { + + return databaseIndex; + } + + @Override + public void setDatabaseIndex(int databaseIndex) { + + this.databaseIndex = databaseIndex; + } + @Override public String getContributor() { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/ILibraryInformation.java b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/ILibraryInformation.java index 3f9e5ce1ae..31356b6df6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/ILibraryInformation.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.model/src/org/eclipse/chemclipse/model/identifier/ILibraryInformation.java @@ -184,20 +184,14 @@ public interface ILibraryInformation extends IClassifier, Serializable { */ void setMiscellaneous(String miscellaneous); - /** - * Returns the database information. - * - * @return String - */ String getDatabase(); - /** - * Sets the database information. - * - * @return String - */ void setDatabase(String database); + int getDatabaseIndex(); + + void setDatabaseIndex(int databaseIndex); + /** * Returns the contributor information. *