Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv17964/cmsc/portlets/src/java/com/finalist/cmsc/portlets
Modified Files:
RelatedContentPortlet.java
Log Message:
CMSC-959 - formatting + javadoc + typo's
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-959
Index: RelatedContentPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/RelatedContentPortlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- RelatedContentPortlet.java 12 Jun 2008 13:44:17 -0000 1.7
+++ RelatedContentPortlet.java 12 Jun 2008 15:12:21 -0000 1.8
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -12,6 +13,8 @@
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
+import net.sf.mmapps.commons.util.StringUtil;
+
import org.apache.commons.lang.StringUtils;
import org.apache.pluto.core.impl.PortletRequestImpl;
@@ -21,12 +24,10 @@
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
-import net.sf.mmapps.commons.util.StringUtil;
-
public class RelatedContentPortlet extends AbstractContentPortlet {
/**
- * This rexex pattern is uesd to match the elementId from a contentURL.
+ * This regex pattern is used to match the elementId from a contentURL.
*/
private static final String CONTENTURL_ELEMENTID_PATTERN =
"/content/([0-9]+)";
@@ -39,8 +40,8 @@
elementId = getElementIdFromScreen(req, window);
if (StringUtil.isEmpty(elementId)) {
elementId =
getElementIdFromContentURL(req);
- if (StringUtil.isEmpty(elementId)) {
- elementId = getElementId(req);
+ if (StringUtils.isEmpty(elementId)) {
+ elementId = getElementId(req, window);
}
}
}
@@ -52,32 +53,32 @@
super.doView(req, res);
}
- protected String getElementId(RenderRequest req) {
- // Extension point
- return null;
- }
+ @Override
+ protected void doEditDefaults(RenderRequest req, RenderResponse res) throws
IOException, PortletException {
+ Integer pageid = getCurrentPageId(req);
+ String pagepath = SiteManagement.getPath(pageid, true);
- private String getElementIdFromScreen(RenderRequest req, String window)
{
- Integer pageId = getCurrentPageId(req);
- NavigationItem item = SiteManagement.getNavigationItem(pageId);
- if (item instanceof Page) {
- Page page = (Page) item;
- int portletId = page.getPortlet(window);
- Portlet portlet = SiteManagement.getPortlet(portletId);
- if (portlet != null) {
- return
portlet.getParameterValue(CONTENTELEMENT);
- }
- }
- return null;
+ if (pagepath != null) {
+ Set<String> positions =
SiteManagement.getPagePositions(pageid.toString());
+ List<String> orderedPositions = new ArrayList<String>(positions);
+ Collections.sort(orderedPositions);
+ setAttribute(req, "pagepositions", new
ArrayList<String>(orderedPositions));
}
-
- private Integer getCurrentPageId(RenderRequest req) {
- String pageId = (String)
req.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
- return Integer.valueOf(pageId);
+ super.doEditDefaults(req, res);
}
- private HttpServletRequest getServletRequest(RenderRequest req) {
- return (HttpServletRequest) ((PortletRequestImpl)
req).getRequest();
+ /**
+ * This method can be overridden to provide your own mechanism for getting
an
+ * elementId. The default implementation returns <code>null</code>.
+ *
+ * @param req
+ * originating RenderRequest
+ * @param window
+ * the passed 'window' parameter.
+ * @return the elementId
+ */
+ protected String getElementId(RenderRequest request, String window) {
+ return null;
}
private String getElementIdFromRequestParameters(RenderRequest req,
String window) {
@@ -96,18 +97,18 @@
return null;
}
- @Override
- protected void doEditDefaults(RenderRequest req, RenderResponse res)
throws IOException, PortletException {
- Integer pageid = getCurrentPageId(req);
- String pagepath = SiteManagement.getPath(pageid, true);
-
- if (pagepath != null) {
- Set<String> positions =
SiteManagement.getPagePositions(pageid.toString());
- ArrayList<String> orderedPositions = new
ArrayList<String>(positions);
- Collections.sort(orderedPositions);
- setAttribute(req, "pagepositions", new
ArrayList<String>(orderedPositions));
+ private String getElementIdFromScreen(RenderRequest req, String window) {
+ Integer pageId = getCurrentPageId(req);
+ NavigationItem item = SiteManagement.getNavigationItem(pageId);
+ if (item instanceof Page) {
+ Page page = (Page) item;
+ int portletId = page.getPortlet(window);
+ Portlet portlet = SiteManagement.getPortlet(portletId);
+ if (portlet != null) {
+ return portlet.getParameterValue(CONTENTELEMENT);
}
- super.doEditDefaults(req, res);
+ }
+ return null;
}
private String getElementIdFromContentURL(RenderRequest req) {
@@ -119,4 +120,13 @@
}
return null;
}
+
+ private Integer getCurrentPageId(RenderRequest req) {
+ String pageId = (String)
req.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
+ return Integer.valueOf(pageId);
+ }
+
+ private HttpServletRequest getServletRequest(RenderRequest req) {
+ return (HttpServletRequest) ((PortletRequestImpl) req).getRequest();
+ }
}
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
