paulsp 2002/11/23 04:04:19
Modified: src/java/org/apache/jetspeed/util/template
BaseJetspeedLink.java
Log:
o Enclosed Log.debug() in "if (Log.getLogger().isDebugEnabled()) {}"
o Removed unused imports that where commented out
Revision Changes Path
1.21 +27 -13
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java
Index: BaseJetspeedLink.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BaseJetspeedLink.java 23 Nov 2002 11:46:42 -0000 1.20
+++ BaseJetspeedLink.java 23 Nov 2002 12:04:19 -0000 1.21
@@ -65,17 +65,12 @@
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.util.template.JetspeedLink;
-//import org.apache.jetspeed.om.profile.Entry;
// Turbine
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.DynamicURI;
-//import org.apache.turbine.util.template.TemplateLink;
import org.apache.turbine.services.pull.ApplicationTool;
-//import org.apache.turbine.services.pool.TurbinePool;
-//import org.apache.turbine.services.pool.PoolService;
-//import org.apache.turbine.services.TurbineServices;
/**
* <p>A customized version of the TemplateLink which can handle portlet
@@ -582,7 +577,10 @@
uriPathElement = JetspeedResources.PATH_PORTLET_KEY;
break;
case JetspeedLink.PORTLET_ID_QUERY:
- Log.debug("BaseJetspeedLink: elementValue = " + elementValue);
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("BaseJetspeedLink: elementValue = " +
elementValue);
+ }
uriPathElement = JetspeedResources.PATH_PORTLETID_KEY;
ProfileLocator baseLocator = Profiler.createLocator();
Profile baseProfile = null;
@@ -602,7 +600,10 @@
case JetspeedLink.USER:
try
{
- Log.debug("BaseJetspeedLink: rootValue user = " +
rootValue);
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("BaseJetspeedLink: rootValue user = "
+ rootValue);
+ }
baseLocator.setUser(org.apache.jetspeed.services.JetspeedSecurity.getUser(rootValue));
}
catch (Exception se)
@@ -633,18 +634,31 @@
}
baseProfile = Profiler.getProfile(baseLocator);
}
- Log.debug("BaseJetspeedLink: baseLocator = " +
baseLocator.getPath());
+
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("BaseJetspeedLink: baseLocator = " +
baseLocator.getPath());
+ }
if ((baseProfile != null) && (elementValue != null))
- {
- Log.debug("BaseJetspeedLink: baseProfile = " +
baseProfile.toString());
+ {
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("BaseJetspeedLink: baseProfile = " +
baseProfile.toString());
+ }
if (baseProfile.getDocument() != null)
{
- Log.debug("BaseJetspeedLink: baseProfile.getDocment() =
" + baseProfile.getDocument());
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("BaseJetspeedLink:
baseProfile.getDocment() = " + baseProfile.getDocument());
+ }
Entry entry =
baseProfile.getDocument().getEntry(elementValue);
if (entry != null)
{
- Log.debug("BaseJetspeedLink: entry id = " +
entry.getId());
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("BaseJetspeedLink: entry id = " +
entry.getId());
+ }
elementValue = entry.getId();
}
else
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
