[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet TagRelatedPortlet.java TagCloudPortlet.java

2008-10-07 Thread fpunt 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
In directory 
james.mmbase.org:/tmp/cvs-serv3995/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet

Modified Files:
TagRelatedPortlet.java TagCloudPortlet.java 
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-1066


Index: TagRelatedPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- TagRelatedPortlet.java  23 Sep 2008 15:19:25 -  1.4
+++ TagRelatedPortlet.java  7 Oct 2008 12:05:00 -   1.5
@@ -38,15 +38,19 @@
String elementId = getRelatedElementId(req, window);
 
if (elementId != null) {
-   ListTag tags = 
TagCloudUtil.getRelatedTags(Integer.parseInt(elementId));
req.setAttribute(elementId, elementId);
+   if(req.getAttribute(loadTags) == null || 
req.getAttribute(loadTags).equals(true)) {
+   ListTag tags = 
TagCloudUtil.getRelatedTags(Integer.parseInt(elementId));
req.setAttribute(tags, tags);
+   }
} else {
String channelId = getIdFromScreen(req, window, 
contentchannel);
if (channelId != null) {
-   ListTag tags = 
TagCloudUtil.getChannelRelatedTags(new Integer(channelId));
req.setAttribute(channelId, channelId);
+   if(req.getAttribute(loadTags) == null || 
req.getAttribute(loadTags).equals(true)) {
+   ListTag tags = 
TagCloudUtil.getChannelRelatedTags(new Integer(channelId));
req.setAttribute(tags, tags);
+   }
} else {
String tag = getIdFromScreen(req, window, 
tag);
if (tag == null) {
@@ -54,12 +58,15 @@
}
if(tag != null) {
tag = tag.replaceAll(0x8,  );
-   ListTag tags = 
TagCloudUtil.getTagRelatedTags(tag);
req.setAttribute(tag, tag);
+
+   if(req.getAttribute(loadTags) == null 
|| req.getAttribute(loadTags).equals(true)) {
+   ListTag tags = 
TagCloudUtil.getTagRelatedTags(tag);
req.setAttribute(tags, tags);
}
}
}
+   }
super.doView(req, res);
}
 


Index: TagCloudPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TagCloudPortlet.java18 Sep 2008 11:21:21 -  1.2
+++ TagCloudPortlet.java7 Oct 2008 12:05:00 -   1.3
@@ -9,11 +9,10 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import com.finalist.cmsc.portlets.AbstractContentPortlet;
 import com.finalist.portlets.tagcloud.Tag;
 import com.finalist.portlets.tagcloud.util.TagCloudUtil;
 
-public class TagCloudPortlet extends AbstractContentPortlet {
+public class TagCloudPortlet extends TagRelatedPortlet {
 
@Override
protected void doView(RenderRequest req, RenderResponse res)
@@ -26,6 +25,8 @@
 
ListTag tags = TagCloudUtil.getTags(max, orderBy, up);
req.setAttribute(tags, tags);
+   req.setAttribute(loadTags, false);
+
super.doView(req, res);
}
 
@@ -33,6 +34,7 @@
protected void saveParameters(ActionRequest request, String portletId) {
setPortletParameter(portletId, param_max, 
request.getParameter(param_max));
setPortletParameter(portletId, param_orderBy, 
request.getParameter(param_orderBy));
+   super.saveParameters(request, portletId);
}
 
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet TagRelatedPortlet.java TagCloudPortlet.java

2008-10-07 Thread fpunt 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
In directory 
james.mmbase.org:/tmp/cvs-serv3891/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet

Modified Files:
  Tag: b1_5
TagRelatedPortlet.java TagCloudPortlet.java 
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-1066


Index: TagRelatedPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- TagRelatedPortlet.java  23 Sep 2008 15:19:25 -  1.4
+++ TagRelatedPortlet.java  7 Oct 2008 12:03:15 -   1.4.2.1
@@ -38,15 +38,19 @@
String elementId = getRelatedElementId(req, window);
 
if (elementId != null) {
-   ListTag tags = 
TagCloudUtil.getRelatedTags(Integer.parseInt(elementId));
req.setAttribute(elementId, elementId);
+   if(req.getAttribute(loadTags) == null || 
req.getAttribute(loadTags).equals(true)) {
+   ListTag tags = 
TagCloudUtil.getRelatedTags(Integer.parseInt(elementId));
req.setAttribute(tags, tags);
+   }
} else {
String channelId = getIdFromScreen(req, window, 
contentchannel);
if (channelId != null) {
-   ListTag tags = 
TagCloudUtil.getChannelRelatedTags(new Integer(channelId));
req.setAttribute(channelId, channelId);
+   if(req.getAttribute(loadTags) == null || 
req.getAttribute(loadTags).equals(true)) {
+   ListTag tags = 
TagCloudUtil.getChannelRelatedTags(new Integer(channelId));
req.setAttribute(tags, tags);
+   }
} else {
String tag = getIdFromScreen(req, window, 
tag);
if (tag == null) {
@@ -54,12 +58,15 @@
}
if(tag != null) {
tag = tag.replaceAll(0x8,  );
-   ListTag tags = 
TagCloudUtil.getTagRelatedTags(tag);
req.setAttribute(tag, tag);
+
+   if(req.getAttribute(loadTags) == null 
|| req.getAttribute(loadTags).equals(true)) {
+   ListTag tags = 
TagCloudUtil.getTagRelatedTags(tag);
req.setAttribute(tags, tags);
}
}
}
+   }
super.doView(req, res);
}
 


Index: TagCloudPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagCloudPortlet.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- TagCloudPortlet.java18 Sep 2008 11:21:21 -  1.2
+++ TagCloudPortlet.java7 Oct 2008 12:03:15 -   1.2.2.1
@@ -9,11 +9,10 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import com.finalist.cmsc.portlets.AbstractContentPortlet;
 import com.finalist.portlets.tagcloud.Tag;
 import com.finalist.portlets.tagcloud.util.TagCloudUtil;
 
-public class TagCloudPortlet extends AbstractContentPortlet {
+public class TagCloudPortlet extends TagRelatedPortlet {
 
@Override
protected void doView(RenderRequest req, RenderResponse res)
@@ -26,6 +25,8 @@
 
ListTag tags = TagCloudUtil.getTags(max, orderBy, up);
req.setAttribute(tags, tags);
+   req.setAttribute(loadTags, false);
+
super.doView(req, res);
}
 
@@ -33,6 +34,7 @@
protected void saveParameters(ActionRequest request, String portletId) {
setPortletParameter(portletId, param_max, 
request.getParameter(param_max));
setPortletParameter(portletId, param_orderBy, 
request.getParameter(param_orderBy));
+   super.saveParameters(request, portletId);
}
 
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet TagRelatedPortlet.java TagCloudPortlet.java

2008-09-18 Thread fpunt 
Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
In directory 
james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet

Modified Files:
TagRelatedPortlet.java TagCloudPortlet.java 
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-1066


Index: TagRelatedPortlet.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TagRelatedPortlet.java  15 Sep 2008 09:40:19 -  1.1
+++ TagRelatedPortlet.java  18 Sep 2008 11:21:21 -  1.2
@@ -12,7 +12,14 @@
 import javax.portlet.PortletPreferences;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
+import javax.servlet.http.HttpServletRequest;
 
+import org.apache.pluto.core.impl.PortletRequestImpl;
+import org.apache.struts.taglib.TagUtils;
+
+import com.finalist.cmsc.beans.om.NavigationItem;
+import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.Portlet;
 import com.finalist.cmsc.portalImpl.PortalConstants;
 import com.finalist.cmsc.portlets.RelatedContentPortlet;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
@@ -35,20 +42,72 @@
ListTag tags = TagCloudUtil.getRelatedTags(Integer
.parseInt(elementId));
req.setAttribute(tags, tags);
+   } else {
+   String channelId = getIdFromScreen(req, window, 
contentchannel);
+   if (channelId != null) {
+   ListTag tags = TagCloudUtil
+   .getChannelRelatedTags(new 
Integer(channelId));
+   req.setAttribute(tags, tags);
+   } else {
+   String tag = getIdFromScreen(req, window, 
tag);
+   if (tag == null) {
+   tag = getTagFromRequestParameters(req, 
window);
+   }
+   ListTag tags = 
TagCloudUtil.getTagRelatedTags(tag);
+   req.setAttribute(tags, tags);
+   }
}
super.doView(req, res);
}

+   private HttpServletRequest getServletRequest(RenderRequest req) {
+   return (HttpServletRequest) ((PortletRequestImpl) 
req).getRequest();
+   }
+
+   private String getTagFromRequestParameters(RenderRequest req, String 
window) {
+   String requestURL = 
getServletRequest(req).getRequestURL().toString();
+   String paramName = /_rp_ + window + _tag/1_;
+   int startIndex = requestURL.indexOf(paramName);
+   if (startIndex != -1) {
+   String elementId = requestURL.substring(startIndex
+   + paramName.length());
+   int endIndex = elementId.indexOf(/);
+   if (endIndex != -1) {
+   elementId = elementId.substring(0, endIndex);
+   }
+   return elementId;
+   }
+
+   return null;
+   }
+
+   private String getIdFromScreen(RenderRequest req, String window, String 
var) {
+   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(var);
+   }
+   }
+   return null;
+   }
+
   @Override
-  protected void doEditDefaults(RenderRequest req, RenderResponse res) 
throws IOException, PortletException {
+   protected void doEditDefaults(RenderRequest req, RenderResponse res)
+   throws IOException, PortletException {
  Integer pageid = getCurrentPageId(req);
  String pagepath = SiteManagement.getPath(pageid, true);
 
  if (pagepath != null) {
-SetString positions = 
SiteManagement.getPagePositions(pageid.toString());
+   SetString positions =