From e3964d10a40b1390c29f4a52efa60da6d10cf234 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 9 Jun 2017 13:58:42 +0200
Subject: [PATCH] missing methods added
---
.../annotation/RestAnnotationParserTest.java | 6 ++++++
.../java/lcsb/mapviewer/model/map/AnnotatedObject.java | 9 +++++++++
.../mapviewer/model/map/compartment/OvalCompartment.java | 5 +++++
.../java/lcsb/mapviewer/model/map/reaction/Reaction.java | 2 +-
.../java/lcsb/mapviewer/model/map/species/Element.java | 7 -------
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParserTest.java b/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParserTest.java
index 2817081a20..ff04e70426 100644
--- a/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParserTest.java
+++ b/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/annotation/RestAnnotationParserTest.java
@@ -411,6 +411,12 @@ public class RestAnnotationParserTest extends CellDesignerTestFunctions {
// TODO Auto-generated method stub
return 0;
}
+
+ @Override
+ public String getStringType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
});
fail("Exception expected");
} catch (NotImplementedException e) {
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/AnnotatedObject.java b/model/src/main/java/lcsb/mapviewer/model/map/AnnotatedObject.java
index 6321ce8597..e13e3aa864 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/AnnotatedObject.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/AnnotatedObject.java
@@ -126,4 +126,13 @@ public interface AnnotatedObject extends Serializable {
void setName(String name);
int getId();
+
+
+ /**
+ * Return human readable {@link String} representing class.
+ *
+ * @return human readable {@link String} representing class
+ */
+ public abstract String getStringType();
+
}
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/compartment/OvalCompartment.java b/model/src/main/java/lcsb/mapviewer/model/map/compartment/OvalCompartment.java
index 2f5dc003cc..be5a84f3f9 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/compartment/OvalCompartment.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/compartment/OvalCompartment.java
@@ -38,6 +38,11 @@ public class OvalCompartment extends Compartment {
super(original);
}
+ public OvalCompartment(String elementId) {
+ super();
+ setElementId(elementId);
+ }
+
@Override
public OvalCompartment copy() {
if (this.getClass() == OvalCompartment.class) {
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/reaction/Reaction.java b/model/src/main/java/lcsb/mapviewer/model/map/reaction/Reaction.java
index c13687aaf4..90c1e5cdc6 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/reaction/Reaction.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/reaction/Reaction.java
@@ -402,7 +402,7 @@ public class Reaction implements AnnotatedObject {
* @return short string describing type of the reaction
*/
public String getStringType() {
- throw new NotImplementedException();
+ return "Generic Reaction";
}
/**
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/species/Element.java b/model/src/main/java/lcsb/mapviewer/model/map/species/Element.java
index c4a4c1d979..e624b92ffb 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/species/Element.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/species/Element.java
@@ -1058,13 +1058,6 @@ public abstract class Element implements AnnotatedObject, Serializable {
synonyms.add(synonym);
}
- /**
- * Return human readable {@link String} representing class.
- *
- * @return human readable {@link String} representing class
- */
- public abstract String getStringType();
-
/**
* @return the dataMining
* @see #dataMining
--
GitLab