Story/vspc 232 214 215 multiple languages

vspace/pom.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -168,9 +168,9 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.15</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.mail</groupId>

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

@@ -0,0 +1,22 @@
+package edu.asu.diging.vspace.core.data;
+
+import org.javers.spring.annotation.JaversSpringDataAuditable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.vspace.core.model.IExhibition;
+import edu.asu.diging.vspace.core.model.IExhibitionLanguage;
+import edu.asu.diging.vspace.core.model.impl.ExhibitionLanguage;
+
+@Repository
+@JaversSpringDataAuditable
+public interface ExhibitionLanguageRepository extends PagingAndSortingRepository<ExhibitionLanguage, String>{
+
+    ExhibitionLanguage findByLabel(String label);
+
+    @Query("SELECT l FROM ExhibitionLanguage l WHERE l.exhibition = ?1 AND l.isDefault = true")
+    IExhibitionLanguage findByExhibitionAndIsDefault(IExhibition exhibition);
+
+}
+

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

@@ -0,0 +1,18 @@
+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.IExhibitionLanguage;
+import edu.asu.diging.vspace.core.model.impl.LocalizedText;
+
+@Repository
+@JaversSpringDataAuditable
+public interface LocalizedTextRepository extends PagingAndSortingRepository<LocalizedText, String>{
+
+    List<LocalizedText> findByExhibitionLanguage(IExhibitionLanguage language);
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/exception/ExhibitionLanguageDeletionException.java

@@ -0,0 +1,32 @@
+package edu.asu.diging.vspace.core.exception;
+
+public class ExhibitionLanguageDeletionException  extends Exception {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    public ExhibitionLanguageDeletionException() {
+        super();
+    }
+
+    public ExhibitionLanguageDeletionException(String message, Throwable cause, boolean enableSuppression,
+            boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public ExhibitionLanguageDeletionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ExhibitionLanguageDeletionException(String message) {
+        super(message);
+    }
+
+    public ExhibitionLanguageDeletionException(Throwable cause) {
+        super(cause);
+    }
+
+}
+

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

@@ -0,0 +1,13 @@
+package edu.asu.diging.vspace.core.factory;
+
+import edu.asu.diging.vspace.core.model.impl.ExhibitionAboutPage;
+import edu.asu.diging.vspace.web.staff.forms.AboutPageForm;
+
+public interface IAboutPageFormFactory {
+
+    /**
+     * Creates About Page form object
+     */
+    AboutPageForm createAboutPageForm(ExhibitionAboutPage exhibitionAboutPage);
+
+}

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

@@ -0,0 +1,15 @@
+package edu.asu.diging.vspace.core.factory;
+
+import java.util.List;
+
+import edu.asu.diging.vspace.core.model.ILocalizedText;
+import edu.asu.diging.vspace.core.model.impl.ExhibitionAboutPage;
+
+public interface IExhibitionAboutPageFactory {
+
+    /**
+     * Creates Exhibition About Page
+     */
+    ExhibitionAboutPage createExhibitionAboutPage(String title, String aboutPageText,  List<ILocalizedText> localizedTitles, List<ILocalizedText> localizedDescriptions);
+
+}

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

@@ -0,0 +1,12 @@
+package edu.asu.diging.vspace.core.factory;
+
+import java.util.List;
+
+import edu.asu.diging.vspace.core.model.ILocalizedText;
+import edu.asu.diging.vspace.web.staff.forms.LocalizedTextForm;
+
+public interface ILocalizedTextFactory {
+
+    ILocalizedText createLocalizedText(Object entity, LocalizedTextForm localizedTextFormData, List<ILocalizedText> detailList);
+
+}

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

@@ -29,4 +29,4 @@ public interface ISlideFactory {
      */
     ISlide createSlide(IModule module, SlideForm form, SlideType type);
 
-}
+}

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

@@ -0,0 +1,11 @@
+package edu.asu.diging.vspace.core.factory;
+
+import edu.asu.diging.vspace.core.model.IExhibition;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.web.staff.forms.SlideForm;
+
+public interface ISlideFormFactory {
+
+    SlideForm createNewSlideForm(ISlide slide, IExhibition startExhibition);
+
+}

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

@@ -1,13 +1,15 @@
 package edu.asu.diging.vspace.core.factory;
 
 import edu.asu.diging.vspace.core.model.ISpace;
+
 import edu.asu.diging.vspace.web.staff.forms.SpaceForm;
 
 /**
  * (non-javadoc) The ISpaceFactory interface defines a method for creating
  * instances of the edu.asu.diging.vspace.core.model.ISpace interface.
  */
 public interface ISpaceFactory {
+
     /**
      * (non-javadoc) 
      * Creates an instance of the ISpace interface based on the given

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

@@ -0,0 +1,11 @@
+package edu.asu.diging.vspace.core.factory;
+
+import edu.asu.diging.vspace.core.model.IExhibition;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.web.staff.forms.SpaceForm;
+
+public interface ISpaceFormFactory {
+
+    SpaceForm createNewSpaceForm(ISpace space, IExhibition startExhibtion);
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExhibitionAboutPageFactory.java

@@ -0,0 +1,27 @@
+package edu.asu.diging.vspace.core.factory.impl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import edu.asu.diging.vspace.core.factory.IExhibitionAboutPageFactory;
+import edu.asu.diging.vspace.core.model.ILocalizedText;
+import edu.asu.diging.vspace.core.model.impl.ExhibitionAboutPage;
+
+@Component
+public class ExhibitionAboutPageFactory implements IExhibitionAboutPageFactory{
+
+    @Override
+    public ExhibitionAboutPage createExhibitionAboutPage(String title, String aboutPageText,
+            List<ILocalizedText> localizedTitles, List<ILocalizedText> localizedDescriptions) {
+
+        ExhibitionAboutPage exhibitionAboutPage = new ExhibitionAboutPage();       
+        exhibitionAboutPage.setTitle(title);
+        exhibitionAboutPage.setAboutPageText(aboutPageText);
+        exhibitionAboutPage.setExhibitionTitles(localizedTitles);
+        exhibitionAboutPage.setExhibitionTextDescriptions(localizedDescriptions);
+
+        return exhibitionAboutPage;
+    }  
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/LocalizedTextFactory.java

@@ -0,0 +1,54 @@
+package edu.asu.diging.vspace.core.factory.impl;
+
+import java.util.List;
+
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thymeleaf.util.StringUtils;
+
+import edu.asu.diging.vspace.core.data.ExhibitionLanguageRepository;
+import edu.asu.diging.vspace.core.data.LocalizedTextRepository;
+import edu.asu.diging.vspace.core.factory.ILocalizedTextFactory;
+import edu.asu.diging.vspace.core.model.ILocalizedText;
+import edu.asu.diging.vspace.core.model.impl.ExhibitionLanguage;
+import edu.asu.diging.vspace.core.model.impl.LocalizedText;
+import edu.asu.diging.vspace.web.staff.forms.LocalizedTextForm;
+
+@Service
+@Transactional
+public class LocalizedTextFactory implements ILocalizedTextFactory {
+
+    @Autowired
+    private LocalizedTextRepository localizedTextRepo;
+
+    @Autowired
+    private ExhibitionLanguageRepository exhibitionLanguageRepository;
+
+    /**
+     * Adds localized text (names or descriptions) to the specified list.
+     * 
+     * @param entity The entity (slide or space) to which the details will be added.
+     * @param localizedTextFormData The localized text form containing the details to be added.
+     * @param detailList The list in the entity where the details will be added (e.g., slideNames, spaceNames).
+     */
+    @Override
+    public LocalizedText createLocalizedText(Object entity, LocalizedTextForm localizedTextFormData, List<ILocalizedText> detailList) {
+        if (StringUtils.isEmpty(localizedTextFormData.getText())) {
+            return null;
+        }
+        LocalizedText localizedText = localizedTextRepo.findById(localizedTextFormData.getLocalizedTextId()).orElse(null);
+        if (localizedText != null) {
+            localizedText.setText(localizedTextFormData.getText());
+        } else {
+            ExhibitionLanguage exhibitionLanguage = exhibitionLanguageRepository.findById(localizedTextFormData.getExhibitionLanguageId()).orElse(null);
+            if (exhibitionLanguage != null) {
+                localizedText = new LocalizedText(exhibitionLanguage, localizedTextFormData.getText());
+            }
+            detailList.add(localizedText);
+        }
+
+        return localizedText;
+    }
+}

vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideFactory.java

@@ -1,11 +1,11 @@
 package edu.asu.diging.vspace.core.factory.impl;
 
 import java.util.ArrayList;
+
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import edu.asu.diging.vspace.core.factory.IChoiceFactory;
 import edu.asu.diging.vspace.core.factory.ISlideFactory;
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
@@ -40,11 +40,12 @@ public ISlide createSlide(IModule module, SlideForm form, SlideType type) {
             slide = new BranchingPoint();            
             List<IChoice> choices = choiceFactory.createChoices(form.getChoices());
             ((IBranchingPoint) slide).setChoices(choices);
-        }        
+        }
         slide.setName(form.getName());
         slide.setDescription(form.getDescription());
         slide.setModule(module);
         slide.setContents(new ArrayList<IContentBlock>());
         return slide;        
-    }   
+    }
+
 }

vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactory.java

@@ -1,7 +1,6 @@
 package edu.asu.diging.vspace.core.factory.impl;
 
 import org.springframework.stereotype.Service;
-
 import edu.asu.diging.vspace.core.factory.ISpaceFactory;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.impl.Space;
@@ -10,14 +9,16 @@
 @Service
 public class SpaceFactory implements ISpaceFactory {
 
-	/* (non-Javadoc)
-	 * @see edu.asu.diging.vspace.core.factory.impl.ISpaceFactory#createSpace(edu.asu.diging.vspace.web.staff.forms.SpaceForm)
-	 */
-	@Override
-	public ISpace createSpace(SpaceForm form) {
-		ISpace space = new Space();
-		space.setName(form.getName());
-		space.setDescription(form.getDescription());
-		return space;
-	}
-}
+    /**
+     * Creates a new space based on the provided form.
+     * @param form The form containing details for creating the space.
+     * @return The newly created space and saves it to the repository.
+     */
+    @Override
+    public ISpace createSpace(SpaceForm form) {
+        ISpace space = new Space();
+        space.setName(form.getName());
+        space.setDescription(form.getDescription());
+        return space;
+    }	
+}

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

@@ -1,13 +1,16 @@
 package edu.asu.diging.vspace.core.model;
 
+
 public interface IExhibitionLanguage extends IVSpaceElement {
 
     String getCode();
 
     String getLabel();
 
+    void setLabel(String label);
+
     boolean isDefault();
 
-    void setDefault(boolean isDefault);
-          
+    void setDefault(boolean isDefault);   
+
 }

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

@@ -0,0 +1,16 @@
+package edu.asu.diging.vspace.core.model;
+
+import edu.asu.diging.vspace.core.model.impl.ExhibitionLanguage;
+
+public interface ILocalizedText {
+    String getId();
+
+    String getText();
+
+    void setText(String text);
+
+    ExhibitionLanguage getExhibitionLanguage();
+
+    void setExhibitionLanguage( ExhibitionLanguage exhibitionLanguage);
+
+}

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

@@ -15,4 +15,12 @@ public interface ISlide extends IVSpaceElement {
     IImageBlock getFirstImageBlock();
 
     ITextBlock getFirstMatchedTextBlock(String searchTerm);
+
+    List<ILocalizedText> getSlideNames();
+
+    void setSlideNames(List<ILocalizedText> slideNames);
+
+    void setSlideDescriptions(List<ILocalizedText> slideDescriptions);
+
+    List<ILocalizedText> getSlideDescriptions();
 }

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

@@ -33,5 +33,13 @@ public interface ISpace extends IVSpaceElement {
     void setShowUnpublishedLinks(Boolean showUnpublishedLinks);
 
     void setHideIncomingLinks(boolean hideIncomingLinks);
+
+    List<ILocalizedText> getSpaceNames();
+
+    void setSpaceNames(List<ILocalizedText> spaceNames);
+
+    void setSpaceDescriptions(List<ILocalizedText> spaceDescriptions);
+
+    List<ILocalizedText> getSpaceDescriptions() ;
 
 }