morciuch 2002/08/21 08:55:42
Modified: src/java/org/apache/jetspeed/util/template JetspeedTool.java
Log:
Check style + javadoc updates - no functional changes made
Revision Changes Path
1.22 +32 -21
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java
Index: JetspeedTool.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JetspeedTool.java 20 Aug 2002 17:38:31 -0000 1.21
+++ JetspeedTool.java 21 Aug 2002 15:55:42 -0000 1.22
@@ -63,7 +63,6 @@
import org.apache.jetspeed.portal.PortletSet;
import org.apache.jetspeed.portal.PortletControl;
import org.apache.jetspeed.services.PortalToolkit;
-import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.Profiler;
@@ -563,12 +562,13 @@
* <P>
* Issues to resolve:
* <UL>
- * <LI> is new portlet instance created everytime someone previews the same
portlet?
- * <LI>should use the same skin as the current pane
+ * <LI>is new portlet instance created everytime someone previews the same
portlet?</LI>
+ * <LI>should use the same skin as the current pane</LI>
* <LI>if TitlePortletControl is used, the action icons (max, min, etc) are not
functional.
- * Also, customize icon should not be present.
+ * Also, customize icon should not be present.</LI>
* <LI> interactive portlets (such as DatabaseBrowser) lose functionality (such
as sorting
- * in DatabaseBrowser).
+ * in DatabaseBrowser).</LI>
+ * </UL>
*
* @param portletName
* Name of the portlet as defined in registry
@@ -582,22 +582,23 @@
ConcreteElement result = null;
Portlet p = null;
- try {
+ try
+ {
// Always set portlet id to "preview" so each preview request gets it
from the cache.
// At least, I think that's how it works.
p = PortletFactory.getPortlet(portletName, "preview");
- PortletControl control = controlName == null ?
PortalToolkit.getControl((String)null) :
-
PortalToolkit.getControl(controlName);
+ PortletControl control = controlName == null ?
PortalToolkit.getControl((String) null)
+ :
PortalToolkit.getControl(controlName);
if (control != null)
{
- JetspeedRunData jdata = (JetspeedRunData)rundata;
- // Use the profile's skin
-
p.getPortletConfig().setSkin(PortalToolkit.getSkin(jdata.getProfile().getDocument().getPortlets().getSkin()));
+ JetspeedRunData jdata = (JetspeedRunData) rundata;
+ // Use the profile's skin - deprecated
+ //
p.getPortletConfig().setSkin(PortalToolkit.getSkin(jdata.getProfile().getDocument().getPortlets().getSkin()));
control.setPortlet(p);
control.init();
result = control.getContent(rundata);
}
- else if (p!=null)
+ else if (p != null)
{
result = p.getContent(rundata);
}
@@ -620,23 +621,33 @@
/**
* Returns a parameter in its defined parameter style
*
- * @param portlet
- * @param parmName
- * @return
+ * @param data for this request
+ * @param portlet portlet instance
+ * @param parmName parameter name
+ * @return current parameter value using specified presentation style
*/
public static String getPortletParameter(RunData data, Portlet portlet, String
parmName)
{
String result = null;
- try {
- if (portlet != null && parmName != null) {
+ try
+ {
+ if (portlet != null && parmName != null)
+ {
Map portletParms = portlet.getPortletConfig().getInitParameters();
String parmValue =
portlet.getPortletConfig().getInitParameter(parmName);
String parmStyle =
portlet.getPortletConfig().getInitParameter(parmName + ".style");
- if (parmStyle != null) {
- result = ParameterLoader.getInstance().eval(data, parmStyle,
parmName, parmValue, portletParms);
+ if (parmStyle != null)
+ {
+ result = ParameterLoader.getInstance().eval(data,
+ parmStyle,
+ parmName,
+ parmValue,
+ portletParms);
}
}
- } catch (Exception e){
+ }
+ catch (Exception e)
+ {
Log.error(e);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
