Author: dolander
Date: Tue Mar 8 12:31:04 2005
New Revision: 156563
URL: http://svn.apache.org/viewcvs?view=rev&rev=156563
Log:
Clean up of some additional TODOs
Cleanup a few TODOs in the ExpressionHandling
Add logging for a few System.err.println()
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TBodyTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java?view=diff&r1=156562&r2=156563
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java
Tue Mar 8 12:31:04 2005
@@ -1,11 +1,12 @@
package org.apache.beehive.netui.tags;
-import org.apache.beehive.netui.pageflow.util.URLRewriterService;
+//import org.apache.beehive.netui.pageflow.util.URLRewriterService;
import org.apache.beehive.netui.tags.html.Html;
import org.apache.beehive.netui.tags.javascript.IScriptReporter;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.util.Bundle;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.core.urls.URLRewriterService;
import org.apache.struts.Globals;
import org.apache.struts.util.RequestUtils;
@@ -114,8 +115,9 @@
if (ctxt instanceof PageContext)
return (PageContext) ctxt;
- // @todo: need to log an error
+ // assert the page context and log an error in production
assert(false) : "The JspContext was not a PageContext";
+ logger.error("The JspContext was not a PageContext");
return null;
}
@@ -241,7 +243,7 @@
final protected String rewriteName(String name)
{
PageContext pageContext = getPageContext();
- return URLRewriterService.rewriteName(pageContext.getServletContext(),
pageContext.getRequest(), name);
+ return
URLRewriterService.getNamePrefix(pageContext.getServletContext(),
pageContext.getRequest(), name) + name;
}
/**
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java?view=diff&r1=156562&r2=156563
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ExpressionHandling.java
Tue Mar 8 12:31:04 2005
@@ -132,10 +132,7 @@
*/
private boolean containsExpression(String expression)
{
- // @todo: this is an assert that needs to be verified
- if (expression == null) {
- System.err.println("Contains found an expresion that is null");
- }
+ // this shouldn't happen because we have checked in isExpression that
the expression isn't null
assert (expression != null) : "The parameter expression must not be
null.";
return getExpressionEvaluator().containsExpression(expression);
}
@@ -144,7 +141,6 @@
*/
private boolean isExpression(String expression)
{
- // todo: eko -- push this into the ExpressionEvaluator
if (expression == null)
return false;
return getExpressionEvaluator().isExpression(expression);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java?view=diff&r1=156562&r2=156563
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AnchorTag.java
Tue Mar 8 12:31:04 2005
@@ -44,10 +44,8 @@
*/
public static class State extends AbstractHtmlState
{
- // @todo: the onclick should be moved out of this into the map....
public String name;
public String href;
- //public String onClick;
public void clear()
{
@@ -55,7 +53,6 @@
name = null;
href = null;
- //onClick = null;
}
}
@@ -82,13 +79,7 @@
renderAttributes(AbstractHtmlState.ATTR_GENERAL, sb, state);
renderAttribute(sb, STYLE, state.style);
- //String onclick =
state.getAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, ONCLICK);
- //if (onclick != null)
- // state.removeAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
ONCLICK);
renderAttributes(AbstractHtmlState.ATTR_JAVASCRIPT, sb, state);
-
- // backward compat for a second
- //renderAttributeSingleQuotes(sb, ONCLICK, onclick);
sb.append(">");
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TBodyTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TBodyTag.java?view=diff&r1=156562&r2=156563
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TBodyTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TBodyTag.java
Tue Mar 8 12:31:04 2005
@@ -48,8 +48,6 @@
extends TBodyTag
implements HtmlConstants
{
-
- // @todo: need to support %coreattrs, %i18n, %events, %cellhalign,
%cellvalign on <tbody>
public void doStartTag(AbstractRenderAppender sb, AbstractTagState
renderState)
{
assert(sb != null) : "Parameter 'sb' must not be null";
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java?view=diff&r1=156562&r2=156563
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java
Tue Mar 8 12:31:04 2005
@@ -49,8 +49,6 @@
extends TFootTag
implements HtmlConstants
{
-
- // @todo: need to support %coreattrs, %i18n, %events, %cellhalign,
%cellvalign on <tfoot>
public void doStartTag(AbstractRenderAppender sb, AbstractTagState
renderState)
{
assert(sb != null) : "Parameter 'sb' must not be null";
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java?view=diff&r1=156562&r2=156563
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java
Tue Mar 8 12:31:04 2005
@@ -46,7 +46,6 @@
private static class Rendering
extends THeadTag implements HtmlConstants
{
- // @todo: need to support %coreattrs, %i18n, %events, %cellhalign,
%cellvalign on <thead>
public void doStartTag(AbstractRenderAppender sb, AbstractTagState
renderState)
{
assert(sb != null) : "Parameter 'sb' must not be null";
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java?view=diff&r1=156562&r2=156563
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
Tue Mar 8 12:31:04 2005
@@ -18,6 +18,7 @@
package org.apache.beehive.netui.tags.tree;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
+import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.jsp.JspException;
@@ -32,6 +33,8 @@
*/
public class TreeHtmlAttribute extends AbstractSimpleTag
{
+ private static final Logger logger =
Logger.getInstance(TreeHtmlAttribute.class);
+
TreeHtmlAttributeInfo _info = new TreeHtmlAttributeInfo();
/**
@@ -141,8 +144,7 @@
ti.setItemAttribute(_info);
}
else {
- // @todo: This needs to be logged....
- System.err.println("Unknown thing here");
+ logger.error("Found an unexpected parent object'" +
o.getClass().getName() + "' expected a TreeItem");
}
}
}
