story/VSPC-242

vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java

@@ -17,6 +17,6 @@ public interface ExternalLinkDisplayRepository extends PagingAndSortingRepositor
 
     @Query("SELECT d FROM ExternalLinkDisplay d WHERE d.externalLink.space.id = ?1")
     public List<IExternalLinkDisplay> findExternalLinkDisplaysForSpace(String spaceId);
-
+  
     public void deleteByExternalLink(IExternalLink link);
 }

vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java

@@ -0,0 +1,19 @@
+package edu.asu.diging.vspace.core.data;
+
+import java.util.List;
+
+import org.javers.spring.annotation.JaversSpringDataAuditable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+
+@Repository
+@JaversSpringDataAuditable
+public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String> {
+
+    public List<IExternalLinkSlide> findBySlide(String slideId);
+
+    public void deleteByExternalLink(IExternalLinkSlide link);
+}

vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java

@@ -6,5 +6,5 @@
 public interface IExternalLinkFactory {
 
     IExternalLink createExternalLink(String title, ISpace space);
-
+    
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java

@@ -11,5 +11,5 @@ public interface IExternalLink extends ILink<ExternalLinkValue> {
     String getExternalLink();
 
     void setExternalLink(String externalLink);
-
+  
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java

@@ -0,0 +1,14 @@
+package edu.asu.diging.vspace.core.model;
+
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+
+public interface IExternalLinkSlide extends ILinkSlide<ExternalLinkValue>{
+
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
+
+    String getExternalLink();
+
+    void setExternalLink(String externalLink);
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java

@@ -9,4 +9,5 @@ public interface ILink<T extends IVSpaceElement> extends IVSpaceElement{
     T getTarget();
 
     void setTarget(T target);
+
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java

@@ -0,0 +1,12 @@
+package edu.asu.diging.vspace.core.model;
+
+public interface ILinkSlide<T extends IVSpaceElement> extends IVSpaceElement {
+
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
+
+    T getTarget();
+
+    void setTarget(T target);
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java

@@ -15,4 +15,14 @@ public interface ISlide extends IVSpaceElement {
     IImageBlock getFirstImageBlock();
 
     ITextBlock getFirstMatchedTextBlock(String searchTerm);
+
+    List<IExternalLinkSlide> getExternalLinks();
+
+    void setExternalLinks(List<IExternalLinkSlide> externalLinks);
+
+    IVSImage getImage();
+
+    void setImage(IVSImage image);
+
+
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java

@@ -0,0 +1,15 @@
+package edu.asu.diging.vspace.core.model.display;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+
+public interface ISlideExternalLinkDisplay extends ILinkDisplay {
+
+    String getId();
+
+    void setId(String id);
+
+    void setExternalLink(IExternalLinkSlide link);
+
+    IExternalLinkSlide getExternalLink();
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java

@@ -0,0 +1,98 @@
+package edu.asu.diging.vspace.core.model.display.impl;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+
+@Entity
+public class SlideExternalLinkDisplay extends LinkDisplay implements ISlideExternalLinkDisplay {
+
+    @Id
+    @GeneratedValue(generator = "externallink_display_id_generator")
+    @GenericGenerator(name = "externallink_display_id_generator", 
+      	parameters = @Parameter(name = "prefix", value = "EXLDS"),
+      	strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+    private String id;
+
+    @OneToOne(targetEntity = ExternalLinkSlide.class)
+    private IExternalLinkSlide externalLink;
+
+    private DisplayType type;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.ISpaceLinkDisplay#getId()
+     */
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * edu.asu.diging.vspace.core.model.display.impl.ISpaceLinkDisplay#setId(java.
+     * lang.String)
+     */
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * getExternalLinkSlide()
+     */
+    @Override
+    public IExternalLinkSlide getExternalLink() {
+        return externalLink;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * setExternalLink(IExternalLinkSlide)
+     */
+    @Override
+    public void setExternalLink(IExternalLinkSlide externalLink) {
+        this.externalLink = externalLink;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * getType()
+     */
+    @Override
+    public DisplayType getType() {
+        return type;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * setType(DisplayType)
+     */
+    @Override
+    public void setType(DisplayType type) {
+        this.type = type;
+    }
+
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java

@@ -25,7 +25,7 @@ public class ExternalLink extends VSpaceElement implements IExternalLink {
     @ManyToOne(targetEntity=Space.class)
     @JoinColumn(name="space_id", nullable=false)
     private ISpace space;
-
+  
     private String externalLink;
 
     /* (non-Javadoc)
@@ -43,10 +43,7 @@ public String getId() {
     public void setId(String id) {
         this.id = id;
     }
-
-    /* (non-Javadoc)
-     * @see edu.asu.diging.vspace.core.model.impl.IExternalLink#getSpace()
-     */
+
     @Override
     public ISpace getSpace() {
         return space;

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java

@@ -0,0 +1,70 @@
+package edu.asu.diging.vspace.core.model.impl;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+@Entity
+public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSlide {
+
+    @Id 
+    @GeneratedValue(generator = "extlinkslide_id_generator")
+    @GenericGenerator(name = "extlinkslide_id_generator", 
+        parameters = @Parameter(name = "prefix", value = "EXLS"), 
+        strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+    private String id;
+
+    @ManyToOne(targetEntity=Slide.class)
+    @JoinColumn(name="slide_id", nullable=false)
+    private ISlide slide;
+
+    private String externalLink;
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public ISlide getSlide() {
+        return slide;
+    }
+
+    @Override
+    public void setSlide(ISlide slide) {
+        this.slide = slide;
+    }
+
+    @Override
+    public String getExternalLink() {
+        return externalLink;
+    }
+
+    @Override
+    public void setExternalLink(String externalLink) {
+        this.externalLink = externalLink;
+    }
+
+    @Override
+    public ExternalLinkValue getTarget() {
+        return new ExternalLinkValue(this.externalLink);
+    }
+
+    @Override
+    public void setTarget(ExternalLinkValue target) {
+        this.externalLink = target.getValue();
+    }
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java

@@ -1,5 +1,6 @@
 package edu.asu.diging.vspace.core.model.impl;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -12,18 +13,23 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.annotations.Parameter;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import edu.asu.diging.vspace.core.model.IContentBlock;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISequence;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ITextBlock;
+import edu.asu.diging.vspace.core.model.IVSImage;
 
 @Entity
 public class Slide extends VSpaceElement implements ISlide {
@@ -45,6 +51,14 @@ public class Slide extends VSpaceElement implements ISlide {
     @ManyToMany(mappedBy = "slides", targetEntity = Sequence.class)
     private List<ISequence> sequence;
 
+    @JsonIgnore
+    @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class, cascade = CascadeType.ALL)
+    private List<IExternalLinkSlide> externalLinks;
+
+    @OneToOne(targetEntity = VSImage.class)
+    @NotFound(action = NotFoundAction.IGNORE)
+    private IVSImage image;
+
     /*
      * (non-Javadoc)
      * 
@@ -86,6 +100,38 @@ public void setModule(IModule module) {
         this.module = module;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.impl.ISlide#getExternalLinks()
+     */
+    @Override
+    public List<IExternalLinkSlide> getExternalLinks() {
+        if (externalLinks == null) {
+            externalLinks = new ArrayList<IExternalLinkSlide>();
+        }
+        return externalLinks;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.impl.ISlide#setExternalLinks(java.util.
+     * List)
+     */
+    @Override
+    public void setExternalLinks(List<IExternalLinkSlide> externalLinks) {
+        this.externalLinks = externalLinks;
+    }
+
+    public IVSImage getImage() {
+        return image;
+    }
+
+    public void setImage(IVSImage image) {
+        this.image = image;
+    }
+
     /*
      * (non-Javadoc)
      * 

vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java

@@ -2,6 +2,7 @@
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -19,4 +20,6 @@ IExternalLinkDisplay updateLink(String title, String id, float positionX, float
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
             String imageFilename,ExternalLinkDisplayMode howToOpen)
             throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+
+
 }