Story/vspc 172

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

@@ -1,6 +1,7 @@
 package edu.asu.diging.vspace.core.services;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLink;
@@ -12,11 +13,11 @@
 public interface IExternalLinkManager extends ILinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>{
 
     IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
+            String linkLabel, String desc, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen, String imageId)
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException;
 
     IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+            String linkLabel, String desc, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename, String existingImageId, ExternalLinkDisplayMode howToOpen)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException;
 }

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

@@ -3,26 +3,28 @@
 import java.util.List;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ILink;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 
 public interface ILinkManager<L extends ILink<T>, T extends IVSpaceElement, U extends ILinkDisplay> {
 
     U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
+            String linkLabel, String linkDesc, DisplayType displayType, byte[] linkImage, String imageFilename,  String existingImageId)
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException;
 
     U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+            String linkLabel, String linkDesc, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename, String existingImageId)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException;
 
     List<U> getLinkDisplays(String spaceId);
 
     void deleteLink(String linkId);
 
-}
+}

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java

@@ -28,7 +28,7 @@
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 @Transactional
 @Service
 public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>
@@ -49,15 +49,6 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
     @Autowired
     private IExternalLinkDisplayFactory externalLinkDisplayFactory;
 
-    @Autowired
-    private IImageFactory imageFactory;
-
-    @Autowired
-    private ImageRepository imageRepo;
-
-    @Autowired
-    private IStorageEngine storage;
-
     @Override
     public List<IExternalLinkDisplay> getLinkDisplays(String spaceId) {
         return externalLinkDisplayRepo.findExternalLinkDisplaysForSpace(spaceId);
@@ -121,9 +112,10 @@ protected void deleteLinkRepo(IExternalLink link) {
 
     @Override
     public IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,
-            ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException {
+            String linkedId, String linkLabel, String desc, DisplayType displayType, byte[] linkImage, String imageFilename,
+            ExternalLinkDisplayMode howToOpen, String imageId )
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException {
+
 
         /*
          * When createLink is called then inside updateLinkAndDisplay(link, displayLink)
@@ -133,17 +125,17 @@ public IExternalLinkDisplay createLink(String title, String id, float positionX,
          * automatically persist howToOpen in database.
          */
         IExternalLinkDisplay externalLinkDisplay = createLink(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, displayType, linkImage, imageFilename);
+                linkLabel, desc, displayType, linkImage, imageFilename, imageId);
         externalLinkDisplay.setHowToOpen(howToOpen);
         return externalLinkDisplay;
 
     }
 
     @Override
     public IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, String linkId, String linkDisplayId, DisplayType displayType,
-            byte[] linkImage, String imageFilename, ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+            String linkedId, String linkLabel, String desc, String linkId, String linkDisplayId, DisplayType displayType,
+            byte[] linkImage, String imageFilename, String existingImageId,  ExternalLinkDisplayMode howToOpen)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         /*
          * When updateLink is called then inside updateLinkAndDisplay(link, displayLink)
@@ -153,9 +145,9 @@ public IExternalLinkDisplay updateLink(String title, String id, float positionX,
          * automatically persist howToOpen in database.
          */
         IExternalLinkDisplay externalLinkDisplay = updateLink(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, linkId, linkDisplayId, displayType, linkImage, imageFilename);
+                linkLabel, desc, linkId, linkDisplayId, displayType, linkImage, imageFilename, existingImageId);
         externalLinkDisplay.setHowToOpen(howToOpen);
         return externalLinkDisplay;
     }
 
-}
+}

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java

@@ -16,11 +16,13 @@
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.VSImage;
+import edu.asu.diging.vspace.core.services.IImageService;
 import edu.asu.diging.vspace.core.services.ILinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 @Transactional
 public abstract class LinkManager<L extends ILink<T>, T extends IVSpaceElement, U extends ILinkDisplay>
         implements ILinkManager<L, T, U> {
@@ -36,37 +38,66 @@ public abstract class LinkManager<L extends ILink<T>, T extends IVSpaceElement,
 
     @Autowired
     private IStorageEngine storage;
+
+    @Autowired
+    private IImageService imageService;
+
+    protected abstract void deleteLinkRepo(L link);
+
+    protected abstract void deleteLinkDisplayRepo(L link);
+
+    protected abstract void removeFromLinkList(ISpace space, L link);
+
+    protected abstract U updateLinkAndDisplay(L link, U displayLink);
+
+    protected abstract U getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException;
+
+    protected abstract L getLink(String linkId);
+
+    protected abstract L createLinkObject(String title, String id);
 
+    protected abstract T getTarget(String linkedId);
+
+    protected abstract U createDisplayLink(L link);
+
     @Override
     public U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException {
+            String linkLabel, String linkDesc, DisplayType displayType, byte[] linkImage, String imageFilename, String existingImageId)
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException {
 
         L link = createLinkObject(title, id);
         T target = getTarget(linkedId);
         link.setName(linkLabel);
+        link.setDescription(linkDesc);
         link.setTarget(target);
         U displayLink = createDisplayLink(link);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        if(existingImageId!=null && !existingImageId.trim().isEmpty()) {
+            setDisplayProperties(displayLink, positionX, positionY, rotation, displayType, existingImageId);
+        } else {
+            setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        }
         return updateLinkAndDisplay(link, displayLink);
 
     }
 
     @Override
     public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename)
-            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
-
+            String linkLabel, String linkDesc, String linkId,  String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename, String existingImageId)
+            throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
         validateSpace(id);
-
         L link = getLink(linkId);
         T target = getTarget(linkedId);
         link.setName(title);
+        link.setDescription(linkDesc);
         link.setTarget(target);
         U displayLink = getDisplayLink(linkDisplayId);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
-        return updateLinkAndDisplay(link, displayLink);
+        if(existingImageId!=null && !existingImageId.trim().isEmpty()) {
+            setDisplayProperties(displayLink, positionX, positionY, rotation, displayType, existingImageId);
+        } else {
+            setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        }
+        return updateLinkAndDisplay(link,displayLink);        
     }
 
     @Override
@@ -77,38 +108,26 @@ public void deleteLink(String linkId) {
         deleteLinkRepo(link);
     }
 
-    protected abstract void deleteLinkRepo(L link);
-
-    protected abstract void deleteLinkDisplayRepo(L link);
-
-    protected abstract void removeFromLinkList(ISpace space, L link);
-
-    protected abstract U updateLinkAndDisplay(L link, U displayLink);
-
-    protected abstract U getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException;
-
-    protected abstract L getLink(String linkId);
-
-    protected abstract L createLinkObject(String title, String id);
-
-    protected abstract T getTarget(String linkedId);
-
-    protected abstract U createDisplayLink(L link);
-
     protected void validateSpace(String id) throws SpaceDoesNotExistException {
         ISpace source = spaceManager.getSpace(id);
         if (source == null) {
             throw new SpaceDoesNotExistException();
         }
     }
+
+    protected void setLinkDisplay(ILinkDisplay linkDisplay, float positionX, float positionY, int rotation, DisplayType displayType) {
+    	linkDisplay.setPositionX(positionX);
+        linkDisplay.setPositionY(positionY);
+        linkDisplay.setRotation(rotation);
+        linkDisplay.setType(displayType != null ? displayType : DisplayType.ARROW);   	
+    }
 
     protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float positionX, float positionY,
             int rotation, DisplayType displayType, byte[] linkImage, String imageFilename)
             throws ImageCouldNotBeStoredException {
-        linkDisplay.setPositionX(positionX);
-        linkDisplay.setPositionY(positionY);
-        linkDisplay.setRotation(rotation);
-        linkDisplay.setType(displayType != null ? displayType : DisplayType.ARROW);
+
+    	setLinkDisplay(linkDisplay, positionX, positionY, rotation, displayType);
+
         if (linkImage != null && linkImage.length > 0) {
             Tika tika = new Tika();
             String contentType = tika.detect(linkImage);
@@ -126,5 +145,15 @@ protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float p
         }
 
     }
+
+    protected void setDisplayProperties(ILinkDisplay linkDisplay, float positionX, float positionY, int rotation, 
+    		DisplayType displayType, String existingImageId) throws ImageCouldNotBeStoredException, ImageDoesNotExistException {
+    	setLinkDisplay(linkDisplay, positionX, positionY, rotation, displayType);
+        if(existingImageId!=null && !existingImageId.trim().isEmpty()) {
+            IVSImage image = imageService.getImageById(existingImageId);
+            linkDisplay.setImage(image);
+        }
+
+    }
 
-}
+}

vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -37,9 +38,11 @@ public class AddExternalLinkController {
     @RequestMapping(value = "/staff/space/{id}/externallink", method = RequestMethod.POST)
     public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
+			@RequestParam("externalLinkDesc") String desc,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
-            @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+            @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file,
+            @RequestParam(value="imageId", required=false) String imageId)
+            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException, ImageDoesNotExistException {
 
         ISpace space = spaceManager.getSpace(id);
         if (space == null) {
@@ -56,7 +59,8 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
                 : ExternalLinkDisplayMode.valueOf(howToOpen);
         IExternalLinkDisplay display = externalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
-                externalLink, title, type, linkImage, filename, externalLinkOpenMode);
+                externalLink, title, desc, type, linkImage, filename, externalLinkOpenMode, imageId);
+
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
         linkNode.put("id", display.getExternalLink().getId());
@@ -67,4 +71,4 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
 
         return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
     }
-}
+}