Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1646 - trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates
|
From: <jbo...@li...> - 2005-11-25 18:19:43
|
Author: unibrew
Date: 2005-11-25 13:19:33 -0500 (Fri, 25 Nov 2005)
New Revision: 1646
Modified:
trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java
trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java
trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java
trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
Log:
[JBLAB-539] Updating classes to support showing random and all primates buttons.
Modified: trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java
===================================================================
--- trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java 2005-11-25 09:38:48 UTC (rev 1645)
+++ trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java 2005-11-25 18:19:33 UTC (rev 1646)
@@ -107,7 +107,9 @@
projectCtx.put(PROJECT_ELEMENT,project);
}
}
- context.put(MUGSHOT_ELEMENT,PrimatesTools.getImgCmPath(portalName) + File.separator + mugshot);
+ if (mugshot!=null) {
+ context.put(MUGSHOT_ELEMENT,PrimatesTools.getImgCmPath(portalName) + File.separator + mugshot);
+ }
context.put(COUNTRY_ELEMENT,country);
context.put(STATUS_ELEMENT,status);
ContentManager cm = ContentManager.getContentManager();
Modified: trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java
===================================================================
--- trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java 2005-11-25 09:38:48 UTC (rev 1645)
+++ trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java 2005-11-25 18:19:33 UTC (rev 1646)
@@ -41,27 +41,23 @@
/*
* Returns DelegateContext object containing all primates.
*/
- public DelegateContext getPrimatesContext (String portalName) {
- DelegateContext context = new DelegateContext();
+ public void getPrimatesContext (DelegateContext context,String portalName) {
DelegateContext primateCtx=null;
for (Primate primate:primates) {
primateCtx=context.next("primate");
primate.setPrimateContextValues(portalName,primateCtx);
}
- return context;
}
/*
* Returns DelegateContext object containging one random primate.
*/
- public DelegateContext getRandomPrimateCtx (String portalName) {
- DelegateContext context = new DelegateContext();
+ public void getRandomPrimateCtx (DelegateContext context, String portalName) {
Random random = new Random();
int rndNbr = random.nextInt(primates.size());
Primate primate = primates.get(rndNbr);
DelegateContext primateCtx = context.next("primate");
primate.setPrimateContextValues(portalName,primateCtx);
- return context;
}
}
Modified: trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java 2005-11-25 09:38:48 UTC (rev 1645)
+++ trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java 2005-11-25 18:19:33 UTC (rev 1646)
@@ -36,15 +36,15 @@
/**
* Returns DelegateContext object containing all primates.
*/
- public DelegateContext getContext(String portalName) {
- return primates.getPrimatesContext(portalName);
+ public void getContext(DelegateContext context, String portalName) {
+ primates.getPrimatesContext(context,portalName);
}
/*
* Returns DelegateContext objcet containing one random primate.
*/
- public DelegateContext getRandomPrimateCtx (String portalName) {
- return primates.getRandomPrimateCtx(portalName);
+ public void getRandomPrimateCtx (DelegateContext context, String portalName) {
+ primates.getRandomPrimateCtx(context,portalName);
}
}
Modified: trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
===================================================================
--- trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2005-11-25 09:38:48 UTC (rev 1645)
+++ trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2005-11-25 18:19:33 UTC (rev 1646)
@@ -4,6 +4,7 @@
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletURL;
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.ProjectsHelper;
@@ -25,15 +26,34 @@
response.setContentType("text/html");
String portalName = ForgeHelper.getPortalName(request);
ProjectsHelper.prepareRequest(request);
+ DelegateContext mainContext=new DelegateContext();
+ String renderType = request.getParameter("render");
+ if (renderType!=null && renderType.compareTo("all")==0) {
+ // Getting the context containing all primates.
+ PrimatesTools.getDesc(portalName).getContext(mainContext,portalName);
+ } else {
+ // Getting the context containing random primate.
+ PrimatesTools.getDesc(portalName).getRandomPrimateCtx(mainContext,portalName);
+ }
- // Getting the context containing random primate.
- DelegateContext primatesContext = PrimatesTools.getDesc(portalName).getRandomPrimateCtx(portalName);
- // Getting the context containing all primates.
- //DelegateContext primatesContext = PrimatesTools.getDesc(portalName).getContext(portalName);
+ // Adding buttons url values to the context.
+ PortletURL url = response.createRenderURL();
+ // Adding random refresh button link to the context.
+ DelegateContext buttonCtx = mainContext.next("button");
+ buttonCtx.put("link",url.toString());
+ buttonCtx.put("name","Next Random Primate");
+
+ url.setParameter("render","all");
+
+ // Adding view all button link to the context.
+ buttonCtx = mainContext.next("button");
+ buttonCtx.put("link",url.toString());
+ buttonCtx.put("name","View All Primates");
+
// Displaying.
- request.setAttribute(PortalJsp.CTX_REQUEST, primatesContext);
+ request.setAttribute(PortalJsp.CTX_REQUEST, mainContext);
// Getting JSP from portlet context.
//PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/primates.jsp");
Modified: trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
===================================================================
--- trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2005-11-25 09:38:48 UTC (rev 1645)
+++ trunk/forge/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2005-11-25 18:19:33 UTC (rev 1646)
@@ -2,6 +2,8 @@
import org.jboss.forge.common.ForgeHelper;
import java.io.File;
+
+import org.jboss.portal.common.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
/**
@@ -72,6 +74,7 @@
return desc;
}
+
private static String NO_PROJECT_PARAM = "&noproject=true";
|
