You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by do...@apache.org on 2005/09/27 22:15:08 UTC
svn commit: r292029 - in
/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags:
IDocumentTypeProducer.java html/AnchorBase.java html/Html.java
javascript/ScriptRequestState.java rendering/TagRenderingBase.java
Author: dolander
Date: Tue Sep 27 13:15:03 2005
New Revision: 292029
URL: http://svn.apache.org/viewcvs?rev=292029&view=rev
Log:
Add an IDocumentTypeProducer interface to allow the factory producing the
document type to be abstracted from the implementation.
Cleanup in a few places
Added:
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IDocumentTypeProducer.java (with props)
Modified:
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
Added: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IDocumentTypeProducer.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IDocumentTypeProducer.java?rev=292029&view=auto
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IDocumentTypeProducer.java (added)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IDocumentTypeProducer.java Tue Sep 27 13:15:03 2005
@@ -0,0 +1,13 @@
+package org.apache.beehive.netui.tags;
+
+/**
+ * This interface will produce a Document type, defined in the enum TagRenderBase.
+ */
+public interface IDocumentTypeProducer
+{
+ /**
+ * This method will return the TagRenderBase enum value for the document type.
+ * @return int
+ */
+ public int getTargetDocumentType();
+}
Propchange: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IDocumentTypeProducer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?rev=292029&r1=292028&r2=292029&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Tue Sep 27 13:15:03 2005
@@ -331,7 +331,7 @@
// if the anchor is submitting a consider this a submit level problem
// set the action to the form action.
- if (_formSubmit == true) {
+ if (_formSubmit) {
formAction = getFormAction();
if ((formAction != null) && (have == 0)) {
have++;
@@ -500,7 +500,7 @@
/**
* @param req
* @param trb
- * @return
+ * @return a boolean indicating if an error has occurred or not
*/
private boolean createNameAnchor(ServletRequest req, TagRenderingBase trb)
{
@@ -530,7 +530,7 @@
* will qualify it into the current scope container.
* @param req The servlet request.
* @param trb The TagRenderer that will output the link
- * @return
+ * @return return a boolean indicating if an error occurred or not
*/
private boolean createPageAnchor(ServletRequest req, TagRenderingBase trb)
{
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java?rev=292029&r1=292028&r2=292029&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java Tue Sep 27 13:15:03 2005
@@ -20,6 +20,7 @@
import org.apache.beehive.netui.tags.AbstractPageError;
import org.apache.beehive.netui.tags.ErrorHandling;
import org.apache.beehive.netui.tags.IErrorReporter;
+import org.apache.beehive.netui.tags.IDocumentTypeProducer;
import org.apache.beehive.netui.tags.javascript.ScriptContainer;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.HtmlTag;
@@ -47,7 +48,7 @@
* @netui:tag name="html" description="Generates the html element and performs error handling within its body."
*/
public class Html extends ScriptContainer
- implements IErrorReporter
+ implements IErrorReporter, IDocumentTypeProducer
{
/**
* The HTML tag is registered into the request with this name. This allows tags reporting
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java?rev=292029&r1=292028&r2=292029&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java Tue Sep 27 13:15:03 2005
@@ -69,6 +69,7 @@
srs.setRequest(request);
RequestUtils.setOuterAttribute(request, JAVASCRIPT_STATUS, srs);
}
+
assert (srs != null);
return srs;
}
@@ -87,8 +88,7 @@
return pattern;
MessageFormat format = new MessageFormat(pattern);
- String result = format.format(args).toString();
- return result;
+ return format.format(args).toString();
}
////************************** MEMBER FUNCTIONS **************************************
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java?rev=292029&r1=292028&r2=292029&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java Tue Sep 27 13:15:03 2005
@@ -18,6 +18,7 @@
package org.apache.beehive.netui.tags.rendering;
import org.apache.beehive.netui.tags.html.Html;
+import org.apache.beehive.netui.tags.IDocumentTypeProducer;
import org.apache.beehive.netui.util.Bundle;
import org.apache.beehive.netui.util.config.ConfigUtil;
import org.apache.beehive.netui.util.config.bean.DocType;
@@ -339,10 +340,10 @@
renderingType = ((Integer) reqRender).intValue();
}
else {
- Html html = (Html) req.getAttribute(Html.HTML_TAG_ID);
- // the default is html 4.0
- if (html != null) {
- renderingType = html.getTargetDocumentType();
+ IDocumentTypeProducer docProducer = (IDocumentTypeProducer) req.getAttribute(Html.HTML_TAG_ID);
+ // the default is docProducer 4.0
+ if (docProducer != null) {
+ renderingType = docProducer.getTargetDocumentType();
}
}
@@ -375,7 +376,7 @@
*/
public static boolean isXHTML(ServletRequest req)
{
- Html html = (Html) req.getAttribute(Html.HTML_TAG_ID);
+ IDocumentTypeProducer html = (IDocumentTypeProducer) req.getAttribute(Html.HTML_TAG_ID);
// the default is html 4.0
int renderingType = _defaultDocType;
@@ -392,17 +393,17 @@
*/
public static ConstantRendering getConstantRendering(ServletRequest req)
{
- Html html = (Html) req.getAttribute(Html.HTML_TAG_ID);
+ IDocumentTypeProducer docProducer = (IDocumentTypeProducer) req.getAttribute(Html.HTML_TAG_ID);
if (_htmlConstants == null) {
_htmlConstants = ConstantRendering.getRendering(HTML_RENDERING);
_xhtmlConstants = ConstantRendering.getRendering(XHTML_RENDERING);
}
- // the default is html 4.0
+ // the default is docProducer 4.0
int renderingType = TagRenderingBase.getDefaultDocType();
- if (html != null) {
- renderingType = html.getTargetDocumentType();
+ if (docProducer != null) {
+ renderingType = docProducer.getTargetDocumentType();
}
return (renderingType == XHTML_RENDERING) ? _xhtmlConstants : _htmlConstants;
@@ -415,12 +416,12 @@
*/
public static String getAmp(ServletRequest req)
{
- Html html = (Html) req.getAttribute(Html.HTML_TAG_ID);
+ IDocumentTypeProducer docProducer = (IDocumentTypeProducer) req.getAttribute(Html.HTML_TAG_ID);
- // the default is html 4.0
+ // the default is docProducer 4.0
int renderingType = HTML_RENDERING;
- if (html != null) {
- renderingType = html.getTargetDocumentType();
+ if (docProducer != null) {
+ renderingType = docProducer.getTargetDocumentType();
}
// pick the map of renderers