From a83396a1c987f5e16c3432d0f852128b877a6ce6 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 11 Jul 2018 15:55:21 +0200
Subject: [PATCH] ElementModification interface removed
---
.../model/map/species/field/ElementModification.java | 9 ---------
.../model/map/species/field/ModificationResidue.java | 5 ++---
.../models/bioEntities/elements/ElementsRestImpl.java | 6 +++---
3 files changed, 5 insertions(+), 15 deletions(-)
delete mode 100644 model/src/main/java/lcsb/mapviewer/model/map/species/field/ElementModification.java
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/species/field/ElementModification.java b/model/src/main/java/lcsb/mapviewer/model/map/species/field/ElementModification.java
deleted file mode 100644
index e9bd63b9f5..0000000000
--- a/model/src/main/java/lcsb/mapviewer/model/map/species/field/ElementModification.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package lcsb.mapviewer.model.map.species.field;
-
-public interface ElementModification {
- ModificationState getState();
-
- String getName();
-
- ElementModification copy();
-}
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/species/field/ModificationResidue.java b/model/src/main/java/lcsb/mapviewer/model/map/species/field/ModificationResidue.java
index c088c3f6f1..1049408c12 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/species/field/ModificationResidue.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/species/field/ModificationResidue.java
@@ -43,7 +43,7 @@ import lcsb.mapviewer.model.map.species.Species;
@DiscriminatorColumn(name = "modification_type", discriminatorType = DiscriminatorType.STRING)
@DiscriminatorValue("GENERIC_MODIFICATION_RESIDUE")
@org.hibernate.annotations.GenericGenerator(name = "test-increment-strategy", strategy = "increment")
-public class ModificationResidue implements Serializable, ElementModification {
+public class ModificationResidue implements Serializable {
/**
*
@@ -118,7 +118,6 @@ public class ModificationResidue implements Serializable, ElementModification {
return result;
}
-
/**
* @return the idModificationResidue
* @see #id
@@ -211,7 +210,7 @@ public class ModificationResidue implements Serializable, ElementModification {
public void setPosition(Point2D position) {
this.position = position;
}
-
+
public ModificationResidue copy() {
throw new NotImplementedException();
}
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java
index cd59a0295a..2e8302e6ac 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java
@@ -20,7 +20,7 @@ import lcsb.mapviewer.model.map.species.Element;
import lcsb.mapviewer.model.map.species.Protein;
import lcsb.mapviewer.model.map.species.Rna;
import lcsb.mapviewer.model.map.species.Species;
-import lcsb.mapviewer.model.map.species.field.ElementModification;
+import lcsb.mapviewer.model.map.species.field.ModificationResidue;
import lcsb.mapviewer.model.map.species.field.Structure;
import lcsb.mapviewer.model.map.species.field.UniprotRecord;
import lcsb.mapviewer.services.SecurityException;
@@ -230,9 +230,9 @@ public class ElementsRestImpl extends BaseRestImpl {
return result;
}
- private List<Map<String, Object>> getModifications(List<? extends ElementModification> elements) {
+ private List<Map<String, Object>> getModifications(List<? extends ModificationResidue> elements) {
List<Map<String, Object>> result = new ArrayList<>();
- for (ElementModification region : elements) {
+ for (ModificationResidue region : elements) {
if (region.getState() != null) {
Map<String, Object> row = new TreeMap<>();
row.put("name", region.getName());
--
GitLab