From ab780dd89c3ddbb111d1f0789ede2f9d229fb065 Mon Sep 17 00:00:00 2001 From: pb Date: Fri, 29 Mar 2013 21:28:33 +0000 Subject: [PATCH] Kleinere Formatierungen etc. git-svn-id: https://svn.libreccm.org/ccm/trunk@2106 8810af33-2d31-482b-a856-94f89814c4df --- .../templates/ccm-portalworkspace/edit.jsp | 4 +- .../templates/ccm-portalworkspace/index.jsp | 4 +- .../com/arsdigita/portlet/news/Loader.java | 4 +- .../portlet/news/Loader_parameter.properties | 2 +- .../arsdigita/portlet/news/NewsPortlet.java | 60 +++++++++---------- .../portlet/news/PersonalisedNewsTarget.java | 4 ++ .../portlet/news/ui/NewsPortletRenderer.java | 27 +++++---- 7 files changed, 57 insertions(+), 48 deletions(-) diff --git a/ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp index e81bc959b..8ca6e4d51 100755 --- a/ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp +++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp @@ -6,7 +6,7 @@ - + DispatcherHelper.cacheDisable(response); @@ -18,7 +18,7 @@ classname="com.arsdigita.portalworkspace.ui.WorkspaceEditor" /> ((AbstractWorkspaceComponent)edit).setWorkspaceModel( - new DefaultWorkspaceSelectionModel()); + new WorkspaceSelectionDefaultModel()); diff --git a/ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp index 7d239cf0a..3a6af9632 100755 --- a/ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp +++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer" /> ((AbstractWorkspaceComponent) view).setWorkspaceModel( - new DefaultWorkspaceSelectionModel()); + new WorkspaceSelectionDefaultModel()); diff --git a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader.java b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader.java index 79ed75c0d..ac38d4abb 100644 --- a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader.java +++ b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader.java @@ -42,7 +42,7 @@ public class Loader extends PackageLoader { private StringParameter typeName = new StringParameter ("uk.gov.westsussex.portlet.news.name", - Parameter.REQUIRED, "News"); + Parameter.REQUIRED, "Latest News"); public Loader() { register(typeName); @@ -56,7 +56,7 @@ public class Loader extends PackageLoader { .createPortletType((String)get(typeName), PortletType.WIDE_PROFILE, NewsPortlet.BASE_DATA_OBJECT_TYPE); - type.setDescription("See your personalised news"); + type.setDescription("Displays the latest news."); } }.run(); } diff --git a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader_parameter.properties b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader_parameter.properties index 8ee7ac908..60da28769 100644 --- a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader_parameter.properties +++ b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/Loader_parameter.properties @@ -1,5 +1,5 @@ uk.gov.westsussex.portlet.news.name.title=Portlet Type Name uk.gov.westsussex.portlet.news.name.purpose=The name of the portlet type that appears in the drop down list of portlet types -uk.gov.westsussex.portlet.news.name.example=News +uk.gov.westsussex.portlet.news.name.example=Latest News uk.gov.westsussex.portlet.news.name.format=[string] diff --git a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/NewsPortlet.java b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/NewsPortlet.java index 7daa4ff88..d07412c4a 100644 --- a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/NewsPortlet.java +++ b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/NewsPortlet.java @@ -91,36 +91,34 @@ public class NewsPortlet extends Portlet implements NewsConstants { set(ITEM_COUNT, new Integer(count)); } - /** - * - * @return whether any homepage news items have been added or edited since last checked. - * If news has been updated, the stored value of the last update is changed. Note - * deleted news items do not cause true to be returned. - * - */ - /* - * - * starting to look doubtful whether this would actually save any time - * - * will recheck when more data on database - public boolean isNewNews() { - NewsItem latest = NewsItem.getMostRecentNewsItem(); - - if (!latest.getID().equals(s_latestNews)) { - s_latestNews = latest.getID(); - return true; - } - DataCollection news = SessionManager.getSession().retrieve(NewsItem.BASE_DATA_OBJECT_TYPE); - news.addEqualsFilter(NewsItem.IS_HOMEPAGE, new Boolean(true)); - long newsCount = news.size(); - if (newsCount != s_newsCount) { - s_newsCount = newsCount; - return true; - } - return false; - - - - }*/ +// Following code it part of 'personalized news' tree which is disabled for +// because we currently (6.6) have no user preferences of something like that. + /** + * + * @return whether any homepage news items have been added or edited since last checked. + * If news has been updated, the stored value of the last update is changed. Note + * deleted news items do not cause true to be returned. + * + */ +/* * starting to look doubtful whether this would actually save any time + * will recheck when more data on database + public boolean isNewNews() { + NewsItem latest = NewsItem.getMostRecentNewsItem(); + + if (!latest.getID().equals(s_latestNews)) { + s_latestNews = latest.getID(); + return true; + } + DataCollection news = SessionManager.getSession().retrieve(NewsItem.BASE_DATA_OBJECT_TYPE); + news.addEqualsFilter(NewsItem.IS_HOMEPAGE, new Boolean(true)); + long newsCount = news.size(); + if (newsCount != s_newsCount) { + s_newsCount = newsCount; + return true; + } + return false; + + } +*/ } diff --git a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/PersonalisedNewsTarget.java b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/PersonalisedNewsTarget.java index 4f35433ab..f63248d08 100644 --- a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/PersonalisedNewsTarget.java +++ b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/PersonalisedNewsTarget.java @@ -21,6 +21,10 @@ package com.arsdigita.portlet.news; import com.arsdigita.domain.DomainCollection; +// Following code it part of 'personalized news' tree which is disabled for now +// because we currently (6.6) have no user preferences of something like that +// in the trunk code. West Sussex used to have a specialized module. + /** * Service is used by news portlet to display potentially useful articles * to the user. diff --git a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/ui/NewsPortletRenderer.java b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/ui/NewsPortletRenderer.java index 8996a8471..ae12e38c4 100644 --- a/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/ui/NewsPortletRenderer.java +++ b/ccm-portlet-latestnews/src/com/arsdigita/portlet/news/ui/NewsPortletRenderer.java @@ -19,9 +19,6 @@ package com.arsdigita.portlet.news.ui; //import uk.gov.westsussex.authentication.ExternalUserFactory; -import com.arsdigita.portlet.news.NewsConstants; -import com.arsdigita.portlet.news.NewsPortlet; -import com.arsdigita.portlet.news.PersonalisedNewsTarget; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.portal.AbstractPortletRenderer; @@ -42,6 +39,9 @@ import com.arsdigita.london.terms.Term; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import com.arsdigita.portal.PortletType; +import com.arsdigita.portlet.news.NewsConstants; +import com.arsdigita.portlet.news.NewsPortlet; +import com.arsdigita.portlet.news.PersonalisedNewsTarget; import com.arsdigita.xml.Element; import java.text.DateFormat; @@ -52,13 +52,13 @@ import org.apache.log4j.Logger; /** - * + * Class selects the news to display and generates the xml. * * @author Chris Gilbert (cgyg9330) <chris.gilbert@westsussex.gov.uk> * @version $Id: NewsPortletRenderer.java 2005/03/07 13:48:49 cgyg9330 Exp $ */ public class NewsPortletRenderer extends AbstractPortletRenderer - implements NewsConstants { + implements NewsConstants { /** Private logger instance for debugging purpose */ private static final Logger s_log = @@ -94,6 +94,10 @@ public class NewsPortletRenderer extends AbstractPortletRenderer thisUser = Kernel.getPublicUser(); } +// Following code it part of 'personalized news' tree which is disabled for now +// because we currently (6.6) have no user preferences of something like that +// in the trunk code. West Sussex used to have a specialized module. +// // Object customUser = ExternalUserFactory.getCustomUserObject(thisUser); // if (customUser instanceof PersonalisedNewsTarget) { // newsPortlet.addAttribute(PERSONALISED_ATTRIBUTE, "true"); @@ -115,11 +119,14 @@ public class NewsPortletRenderer extends AbstractPortletRenderer s_log.debug("FINISH - generateBodyXML"); } - /** - * - * @param newsPortlet - * @param profiledUser - */ +// Following code it part of 'personalized news' tree which is disabled for now +// because we currently (6.6) have no user preferences of something like that +// in the trunk code. West Sussex used to have a specialized module. +// /** +// * +// * @param newsPortlet +// * @param profiledUser +// */ /* CURRENTLY NOT AVAILABLE private void getPersonalisedNews( PageState state, Element main,