diff --git a/service/src/main/java/lcsb/mapviewer/services/view/OverviewLinkView.java b/service/src/main/java/lcsb/mapviewer/services/view/OverviewLinkView.java deleted file mode 100644 index 93defd7c09d9408e0b77c50f2b0f48566e4be3c4..0000000000000000000000000000000000000000 --- a/service/src/main/java/lcsb/mapviewer/services/view/OverviewLinkView.java +++ /dev/null @@ -1,208 +0,0 @@ -package lcsb.mapviewer.services.view; - -import java.awt.geom.Point2D; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.primefaces.model.map.LatLng; - -import lcsb.mapviewer.model.map.OverviewLink; - -/** - * View representatin of a {@link OverviewLink}. It's a light structre that - * present {@link OverviewLink} data to the client side. - * - * @author Piotr Gawron - * - */ -public class OverviewLinkView extends AbstractView<OverviewLink> implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * List of coordinates that correspond to polygon area that should be - * clickable on parent image. - */ - private List<Point2D> polygon = new ArrayList<Point2D>(); - - /** - * Zoom level when link is representing - * {@link lcsb.mapviewer.model.map.OverviewModelLink OverviewModelLink}. - */ - private Integer zoomLevel; - - /** - * Lat Lng coordinate when link is representing - * {@link lcsb.mapviewer.model.map.OverviewModelLink OverviewModelLink}. - */ - private LatLng latLng; - - /** - * Model identinfier when link is representing - * {@link lcsb.mapviewer.model.map.OverviewModelLink OverviewModelLink}. - */ - private Integer modelLinkId; - - /** - * Image identinfier when link is representing - * {@link lcsb.mapviewer.model.map.OverviewImageLink OverviewImageLink}. - */ - private Integer imageLinkId; - - /** - * Query string when link is representing - * {@link lcsb.mapviewer.model.map.OverviewSearchLink OverviewSearchLink}. - */ - private String query; - - /** - * Type of the class that implements - * {@link lcsb.mapviewer.model.map.OverviewLink OverviewLink}. - */ - private String type; - - /** - * Default constructor. - * - * @param object - * for which the view is created - */ - protected OverviewLinkView(OverviewLink object) { - super(object); - } - - /** - * Default constructor. Should be used only for deserialization. - */ - protected OverviewLinkView() { - } - - /** - * @return the polygon - * @see #polygon - */ - public List<Point2D> getPolygon() { - return polygon; - } - - /** - * @param polygon - * the polygon to set - * @see #polygon - */ - public void setPolygon(String polygon) { - String[] tmp = polygon.split(" "); - for (String string : tmp) { - Double x = Double.valueOf(string.split(",")[0].trim()); - Double y = Double.valueOf(string.split(",")[1].trim()); - this.polygon.add(new Point2D.Double(x, y)); - } - } - - /** - * @return the zoomLevel - * @see #zoomLevel - */ - public Integer getZoomLevel() { - return zoomLevel; - } - - /** - * @param zoomLevel - * the zoomLevel to set - * @see #zoomLevel - */ - public void setZoomLevel(Integer zoomLevel) { - this.zoomLevel = zoomLevel; - } - - /** - * @return the modelLinkId - * @see #modelLinkId - */ - public Integer getModelLinkId() { - return modelLinkId; - } - - /** - * @param modelLinkId - * the modelLinkId to set - * @see #modelLinkId - */ - public void setModelLinkId(Integer modelLinkId) { - this.modelLinkId = modelLinkId; - } - - /** - * @return the imageLinkId - * @see #imageLinkId - */ - public Integer getImageLinkId() { - return imageLinkId; - } - - /** - * @param imageLinkId - * the imageLinkId to set - * @see #imageLinkId - */ - public void setImageLinkId(Integer imageLinkId) { - this.imageLinkId = imageLinkId; - } - - /** - * @return the query - * @see #query - */ - public String getQuery() { - return query; - } - - /** - * @param query - * the query to set - * @see #query - */ - public void setQuery(String query) { - this.query = query; - } - - /** - * @return the type - * @see #type - */ - public String getType() { - return type; - } - - /** - * @param type - * the type to set - * @see #type - */ - public void setType(String type) { - this.type = type; - } - - /** - * @return the latLng - * @see #latLng - */ - public LatLng getLatLng() { - return latLng; - } - - /** - * @param latLng - * the latLng to set - * @see #latLng - */ - public void setLatLng(LatLng latLng) { - this.latLng = latLng; - } - -} diff --git a/service/src/main/java/lcsb/mapviewer/services/view/OverviewLinkViewFactory.java b/service/src/main/java/lcsb/mapviewer/services/view/OverviewLinkViewFactory.java deleted file mode 100644 index c602505e0cf3bd8e9284724bcfb8254e6ab13a9d..0000000000000000000000000000000000000000 --- a/service/src/main/java/lcsb/mapviewer/services/view/OverviewLinkViewFactory.java +++ /dev/null @@ -1,67 +0,0 @@ -package lcsb.mapviewer.services.view; - -import java.awt.geom.Point2D; - -import lcsb.mapviewer.common.exception.NotImplementedException; -import lcsb.mapviewer.model.map.OverviewImageLink; -import lcsb.mapviewer.model.map.OverviewLink; -import lcsb.mapviewer.model.map.OverviewModelLink; -import lcsb.mapviewer.model.map.OverviewSearchLink; -import lcsb.mapviewer.services.utils.gmap.CoordinationConverter; - -import org.apache.log4j.Logger; -import org.springframework.transaction.annotation.Transactional; - -import com.google.gson.Gson; - -/** - * Factory class for {@link OverviewLink} class and subclasses. - * - * @author Piotr Gawron - * - */ -@Transactional(value = "txManager") -public class OverviewLinkViewFactory extends AbstractViewFactory<OverviewLink, OverviewLinkView> { - /** - * Default class logger. - */ - private static Logger logger = Logger.getLogger(OverviewLinkViewFactory.class); - - @Override - public OverviewLinkView create(OverviewLink object) { - OverviewLinkView result = new OverviewLinkView(object); - if (object == null) { - logger.warn("Empty image..."); - return result; - } - result.setPolygon(object.getPolygon()); - - if (object instanceof OverviewModelLink) { - OverviewModelLink modelLink = (OverviewModelLink) object; - result.setModelLinkId(modelLink.getLinkedModel().getId()); - CoordinationConverter cc = new CoordinationConverter(modelLink.getLinkedModel()); - result.setLatLng(cc.toLatLng(new Point2D.Double(modelLink.getxCoord(), modelLink.getyCoord()))); - result.setZoomLevel(modelLink.getZoomLevel()); - - } else if (object instanceof OverviewImageLink) { - result.setImageLinkId(((OverviewImageLink) object).getLinkedOverviewImage().getId()); - } else if (object instanceof OverviewSearchLink) { - result.setQuery(((OverviewSearchLink) object).getQuery()); - } else { - throw new NotImplementedException("Not implemented behaviour for class: " + object.getClass()); - } - result.setType(object.getClass().getSimpleName()); - - return result; - } - - @Override - public String createGson(OverviewLinkView object) { - return new Gson().toJson(object); - } - - @Override - public OverviewLink viewToObject(OverviewLinkView view) { - throw new NotImplementedException(); - } -} diff --git a/service/src/main/resources/applicationContext-service.xml b/service/src/main/resources/applicationContext-service.xml index 4eafac205254cc303713a69dcd8dd97b78644317..e259fea9707f8ebe303fd390fd2bbd39a12c83d4 100644 --- a/service/src/main/resources/applicationContext-service.xml +++ b/service/src/main/resources/applicationContext-service.xml @@ -45,7 +45,6 @@ <bean id="PasswordEncoder" class="lcsb.mapviewer.services.impl.Md5PasswordEncoder"/> <!-- View factories --> - <bean id="OverviewLinkViewFactory" class="lcsb.mapviewer.services.view.OverviewLinkViewFactory"/> <bean id="ReferenceGenomeViewFactory" class="lcsb.mapviewer.services.view.ReferenceGenomeViewFactory"/> <bean id="ReferenceGenomeGeneMappingViewFactory" class="lcsb.mapviewer.services.view.ReferenceGenomeGeneMappingViewFactory"/> diff --git a/service/src/test/java/lcsb/mapviewer/services/view/AllViewTests.java b/service/src/test/java/lcsb/mapviewer/services/view/AllViewTests.java index de944a5cb3b48a010b90246a6b154be1bea0e5d3..3497bf17ae77a122b7eec8313fb9fa9247be0d7e 100644 --- a/service/src/test/java/lcsb/mapviewer/services/view/AllViewTests.java +++ b/service/src/test/java/lcsb/mapviewer/services/view/AllViewTests.java @@ -6,8 +6,6 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({ FrameworkVersionViewTest.class, // - OverviewLinkViewFactoryTest.class, // - OverviewLinkViewTest.class, // ReferenceGenomeViewFactoryTest.class, // ReferenceGenomeGeneMappingViewFactoryTest.class, // }) diff --git a/service/src/test/java/lcsb/mapviewer/services/view/OverviewLinkViewFactoryTest.java b/service/src/test/java/lcsb/mapviewer/services/view/OverviewLinkViewFactoryTest.java deleted file mode 100644 index b437bc15a94c712fe303f61cd25e3eabdeb583c2..0000000000000000000000000000000000000000 --- a/service/src/test/java/lcsb/mapviewer/services/view/OverviewLinkViewFactoryTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package lcsb.mapviewer.services.view; - -import static org.junit.Assert.*; -import lcsb.mapviewer.model.map.OverviewImage; -import lcsb.mapviewer.model.map.OverviewImageLink; -import lcsb.mapviewer.services.ServiceTestFunctions; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -public class OverviewLinkViewFactoryTest extends ServiceTestFunctions{ - - @Autowired - OverviewLinkViewFactory overviewLinkViewFactory; - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testCreateNull() throws Exception { - try { - OverviewLinkView result = overviewLinkViewFactory.create(null); - assertNotNull(result); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testCreate() throws Exception { - try { - OverviewImageLink oil = new OverviewImageLink(); - OverviewImage oi = new OverviewImage(); - oil.setLinkedOverviewImage(oi); - oil.setPolygon("10,10 20,20 100,0"); - OverviewLinkView result = overviewLinkViewFactory.create(oil); - assertNotNull(result); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } -} diff --git a/service/src/test/java/lcsb/mapviewer/services/view/OverviewLinkViewTest.java b/service/src/test/java/lcsb/mapviewer/services/view/OverviewLinkViewTest.java deleted file mode 100644 index 0c9ea8ea7b5fd9a1c841f8d4d3ecffa71b144435..0000000000000000000000000000000000000000 --- a/service/src/test/java/lcsb/mapviewer/services/view/OverviewLinkViewTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package lcsb.mapviewer.services.view; - -import org.apache.commons.lang3.SerializationUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class OverviewLinkViewTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSerialization() { - try { - SerializationUtils.serialize(new OverviewLinkView()); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } -}