diff --git a/service/src/main/java/lcsb/mapviewer/services/search/SearchResultFactory.java b/service/src/main/java/lcsb/mapviewer/services/search/SearchResultFactory.java
index 6380639b2259edbc655afb34e53ed85a2ef5d86a..b70b7bd0e6242fb11c95bfa3ffa91b5509224d1a 100644
--- a/service/src/main/java/lcsb/mapviewer/services/search/SearchResultFactory.java
+++ b/service/src/main/java/lcsb/mapviewer/services/search/SearchResultFactory.java
@@ -1,22 +1,15 @@
package lcsb.mapviewer.services.search;
-import java.util.Collection;
import java.util.List;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import lcsb.mapviewer.annotation.data.Article;
import lcsb.mapviewer.annotation.data.Target;
-import lcsb.mapviewer.common.exception.InvalidArgumentException;
import lcsb.mapviewer.model.map.model.Model;
import lcsb.mapviewer.model.map.species.Element;
import lcsb.mapviewer.services.search.data.ElementIdentifier;
-import lcsb.mapviewer.services.search.data.ElementIdentifier.ElementIdentifierType;
-import lcsb.mapviewer.services.search.db.GeneRow;
-import lcsb.mapviewer.services.search.db.TargetDetails;
-import lcsb.mapviewer.services.search.db.TargetView;
import lcsb.mapviewer.services.view.AnnotationViewFactory;
/**
@@ -58,7 +51,6 @@ public abstract class SearchResultFactory<T, S extends ISearchResultView> extend
@Autowired
private ElementMatcher elementMatcher;
-
protected boolean elementMatch(Target target, Element element) {
return elementMatcher.elementMatch(target, element);
}
diff --git a/service/src/main/java/lcsb/mapviewer/services/search/db/TargetView.java b/service/src/main/java/lcsb/mapviewer/services/search/db/TargetView.java
deleted file mode 100644
index 61c71d53aef353ad0f47f7db698bf5433fba20b1..0000000000000000000000000000000000000000
--- a/service/src/main/java/lcsb/mapviewer/services/search/db/TargetView.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package lcsb.mapviewer.services.search.db;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import lcsb.mapviewer.annotation.data.Article;
-import lcsb.mapviewer.services.view.AbstractTargetView;
-import lcsb.mapviewer.services.view.AnnotationView;
-
-/**
- * {@link lcsb.mapviewer.services.view.AbstractView View} for
- * {@link lcsb.mapviewer.annotation.data.Target targets}.
- *
- * @author Piotr Gawron
- *
- */
-public class TargetView extends AbstractTargetView {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Default class logger.
- */
- @SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(TargetView.class);
-
- /**
- * Name of the target.
- */
- private String name;
-
- /**
- * Database from which target was acquired.
- */
- private AnnotationView annotation;
-
- /**
- * List of genes and proteins included in the target.
- */
- private List<GeneRow> proteins = new ArrayList<>();
-
- /**
- * List of pubmed articles about the target.
- */
- private List<Article> references = new ArrayList<>();
-
- /**
- * Flag informing if target is visible in a submap or not.
- */
- private boolean availableInSubmodel = false;
-
- /**
- * Default constructor. Should be used only for deserialization.
- */
- protected TargetView() {
- }
-
- /**
- * Adds reference article.
- *
- * @param reference
- * article to add
- */
- public void addReference(Article reference) {
- references.add(reference);
- }
-
- /**
- * Adds gene.
- *
- * @param protein
- * gene to add
- */
- public void addProtein(GeneRow protein) {
- proteins.add(protein);
- }
-
- /**
- * Returns link to pubmed that enlist all references.
- *
- * @return link to pubmed that enlist all references
- */
- public String getAllReferencesLink() {
- String result = "http://www.ncbi.nlm.nih.gov/pubmed/?term=";
- for (Article article : getReferences()) {
- result += article.getId() + "+";
- }
- return result;
- }
-
- /**
- * @return the name
- * @see #name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name
- * the name to set
- * @see #name
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the proteins
- * @see #proteins
- */
- public List<GeneRow> getProteins() {
- return proteins;
- }
-
- /**
- * @param proteins
- * the proteins to set
- * @see #proteins
- */
- public void setProteins(List<GeneRow> proteins) {
- this.proteins = proteins;
- }
-
- /**
- * @return the references
- * @see #references
- */
- public List<Article> getReferences() {
- return references;
- }
-
- /**
- * @param references
- * the references to set
- * @see #references
- */
- public void setReferences(List<Article> references) {
- this.references = references;
- }
-
- /**
- * @return the annotation
- * @see #annotation
- */
- public AnnotationView getAnnotation() {
- return annotation;
- }
-
- /**
- * @param annotation
- * the annotation to set
- * @see #annotation
- */
- public void setAnnotation(AnnotationView annotation) {
- this.annotation = annotation;
- }
-
- /**
- * @return the availableIntSubmodel
- * @see #availableInSubmodel
- */
- public boolean isAvailableInSubmodel() {
- return availableInSubmodel;
- }
-
- /**
- * @param availableInSubmodel
- * the availableIntSubmodel to set
- * @see #availableInSubmodel
- */
- public void setAvailableInSubmodel(boolean availableInSubmodel) {
- this.availableInSubmodel = availableInSubmodel;
- }
-
-}
diff --git a/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java b/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java
index 7a0f88d8154271df156c9f42b462aad2415117b7..349617eabda10a7251c67a808c095c861bbae3c3 100644
--- a/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java
+++ b/service/src/test/java/lcsb/mapviewer/services/search/db/AllSearchDbTests.java
@@ -12,7 +12,6 @@ import lcsb.mapviewer.services.search.db.mirna.MiRNAServiceTest;
@SuiteClasses({ AllSearchDrugTests.class, //
ChemicalServiceTest.class, //
MiRNAServiceTest.class, //
- TargetViewTest.class,//
})
public class AllSearchDbTests {
diff --git a/service/src/test/java/lcsb/mapviewer/services/search/db/TargetViewTest.java b/service/src/test/java/lcsb/mapviewer/services/search/db/TargetViewTest.java
deleted file mode 100644
index d1561f348d1c44c5c44f724461fda53a2e5ebb2a..0000000000000000000000000000000000000000
--- a/service/src/test/java/lcsb/mapviewer/services/search/db/TargetViewTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package lcsb.mapviewer.services.search.db;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import lcsb.mapviewer.services.search.db.TargetView;
-
-public class TargetViewTest {
-
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testSerialization() {
- try {
- SerializationUtils.serialize(new TargetView());
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- }
- }
-}