diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/UploadStep.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/UploadStep.java index 7d6565265c..a20300a4bc 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/UploadStep.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/UploadStep.java @@ -391,12 +391,12 @@ public class UploadStep extends AbstractSubmissionStep int i = 0; while (issnsIterator.hasNext()) { SHERPAResponse shresp = sherpaSubmitService.searchRelatedJournalsByISSN(issnsIterator.next()); + java.util.List journals = shresp.getJournals(); java.util.List publishers = shresp.getPublishers(); if (CollectionUtils.isNotEmpty(journals)) { for (SHERPAJournal journ : journals) { - SHERPAPublisher pub = publishers.get(0); List sherpaList = div.addList("sherpaList" + (i + 1), "simple", "sherpaList"); sherpaList.addItem().addFigure(contextPath + "/static/images/" + (i == 0 ? "romeosmall" : "clear") + ".gif", "http://www.sherpa.ac.uk/romeo/", "sherpaLogo"); @@ -404,11 +404,15 @@ public class UploadStep extends AbstractSubmissionStep sherpaList.addItem().addHighlight("sherpaBold").addContent(T_sherpa_journal); sherpaList.addItem(journ.getTitle() + " (" + journ.getIssn() + ")"); - sherpaList.addItem().addHighlight("sherpaBold").addContent(T_sherpa_publisher); - sherpaList.addItemXref(pub.getHomeurl(), pub.getName()); + if(CollectionUtils.isNotEmpty(publishers)) { + SHERPAPublisher pub = publishers.get(0); + sherpaList.addItem().addHighlight("sherpaBold").addContent(T_sherpa_publisher); + sherpaList.addItemXref(pub.getHomeurl(), pub.getName()); + + sherpaList.addItem().addHighlight("sherpaBold").addContent(T_sherpa_colour); + sherpaList.addItem().addHighlight("sherpaStyle " + pub.getRomeocolour()).addContent(message("xmlui.aspect.sherpa.submission." + pub.getRomeocolour())); + } - sherpaList.addItem().addHighlight("sherpaBold").addContent(T_sherpa_colour); - sherpaList.addItem().addHighlight("sherpaStyle " + pub.getRomeocolour()).addContent(message("xmlui.aspect.sherpa.submission." + pub.getRomeocolour())); sherpaList.addItem().addXref("http://www.sherpa.ac.uk/romeo/search.php?issn=" + journ.getIssn(), T_sherpa_more, "sherpaMoreInfo"); i = i + 1;