From bd603f024f11ab9e3c32eff275b3318bf8b3bd48 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 28 Nov 2012 08:42:06 +0000 Subject: [PATCH] =?UTF-8?q?BugFix=20f=C3=BCr=20Ticket=20#1462.=20PersonalP?= =?UTF-8?q?ublications=20hat=20unter=20bestimmten=20Umst=C3=A4nden=20einer?= =?UTF-8?q?=20Fehler=20produziert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1973 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/ui/panels/Paginator.java | 2 +- .../PersonalPublications.java | 48 ++++++------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java index e082ea28b..1bb7159a0 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/Paginator.java @@ -123,7 +123,7 @@ public class Paginator { public int getBegin() { if (pageNumber == 1) { - return 1; + return 0; } else { return ((pageNumber - 1) * pageSize) + 1; } diff --git a/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublications.java b/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublications.java index ee1b6707d..c9444d1fd 100644 --- a/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublications.java +++ b/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublications.java @@ -13,7 +13,6 @@ import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.persistence.DataCollection; import com.arsdigita.xml.Element; import java.util.ArrayList; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -68,10 +67,7 @@ public class PersonalPublications implements ContentGenerator { new LinkedHashMap>(); for (Map.Entry> entry : groupsConfig.entrySet()) { - filterPublicationsByGroup(entry.getKey(), - entry.getValue(), - publications, - publicationsByGroup); + filterPublicationsByGroup(entry.getKey(), entry.getValue(), publications, publicationsByGroup); } final List miscGroup = filterPublicationsForMiscGroup(publications, groupsConfig); @@ -82,8 +78,7 @@ public class PersonalPublications implements ContentGenerator { if (overallSize < config.getGroupSplit()) { publicationsElem.addAttribute("all", "all"); - for (Map.Entry> group : - publicationsByGroup.entrySet()) { + for (Map.Entry> group : publicationsByGroup.entrySet()) { generateXmlForGroup(group.getKey(), availableGroupsElem, publicationsElem, @@ -94,11 +89,10 @@ public class PersonalPublications implements ContentGenerator { } } else { final List availableGroups = new LinkedList(); - for (Map.Entry> entry : groupsConfig. - entrySet()) { - if (!(publicationsByGroup.get(entry.getKey()).isEmpty())) { - generateAvailableForGroup(entry.getKey(), - availableGroupsElem); + for (Map.Entry> entry : groupsConfig.entrySet()) { + if ((publicationsByGroup.get(entry.getKey()) != null) + && !(publicationsByGroup.get(entry.getKey()).isEmpty())) { + generateAvailableForGroup(entry.getKey(), availableGroupsElem); availableGroups.add(entry.getKey()); } } @@ -109,9 +103,7 @@ public class PersonalPublications implements ContentGenerator { } final HttpServletRequest request = state.getRequest(); - final String group = selectGroup(request, - config.getDefaultGroup(), - availableGroups); + final String group = selectGroup(request, config.getDefaultGroup(), availableGroups); generateXmlForGroup(group, availableGroupsElem, @@ -133,9 +125,7 @@ public class PersonalPublications implements ContentGenerator { } } - private List collectPublications( - final GenericPerson author, - final String language) { + private List collectPublications(final GenericPerson author, final String language) { final List publications = new LinkedList(); //final List processed = new ArrayList(); @@ -228,25 +218,18 @@ public class PersonalPublications implements ContentGenerator { groupElem.addAttribute("name", groupName); if (withPaginator) { - final Paginator paginator = new Paginator(state.getRequest(), - publications.size(), - config.getPageSize()); - publicationList = publicationList.subList(paginator.getBegin(), - paginator.getEnd()); + final Paginator paginator = new Paginator(state.getRequest(), publications.size(), config.getPageSize()); + publicationList = publicationList.subList(paginator.getBegin(), paginator.getEnd()); paginator.generateXml(groupElem); } for (PublicationBundle publication : publicationList) { generatePublicationXml(publication.getPublication( - GlobalizationHelper.getNegotiatedLocale().getLanguage()), - groupElem, - state); + GlobalizationHelper.getNegotiatedLocale().getLanguage()), groupElem, state); } } - private void generatePublicationXml(final Publication publication, - final Element parent, - final PageState state) { + private void generatePublicationXml(final Publication publication, final Element parent, final PageState state) { final PersonalPublications.XmlGenerator generator = new PersonalPublications.XmlGenerator(publication); generator.setItemElemName("publications", ""); generator.setListMode(true); @@ -273,9 +256,7 @@ public class PersonalPublications implements ContentGenerator { final String defaultGroupConfig, final List availableGroups) { String group = request.getParameter("group"); - if ((group == null) - || group.trim().isEmpty() - || !(availableGroups.contains(group))) { + if ((group == null) || group.trim().isEmpty() || !(availableGroups.contains(group))) { String defaultGroups[] = defaultGroupConfig.split(","); for (String defaultGroup : defaultGroups) { @@ -337,8 +318,7 @@ public class PersonalPublications implements ContentGenerator { } else { final Boolean pubReviewed = ((Publication) publication.getPrimaryInstance()).getReviewed(); if (publication.getContentType().getAssociatedObjectType().equals(type) - && (reviewed.equals(pubReviewed) - || (pubReviewed == null))) { + && (reviewed.equals(pubReviewed) || (pubReviewed == null))) { group.add(publication); return true; }