Author: dolander
Date: Thu Feb 24 06:53:25 2005
New Revision: 155188
URL: http://svn.apache.org/viewcvs?view=rev&rev=155188
Log:
Apply consistant coding style
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.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/tree/ITreeRootElement.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ServletTreeRenderer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TagTreeRenderer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java
Thu Feb 24 06:53:25 2005
@@ -38,9 +38,12 @@
for (int i = 0; i < numChars; i++) {
c = value.charAt(i);
switch (c) {
- case '<': return true;
- case '&': return true;
- case '"': return true;
+ case '<':
+ return true;
+ case '&':
+ return true;
+ case '"':
+ return true;
}
}
return false;
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/divpanel/DivPanelCRI.java
Thu Feb 24 06:53:25 2005
@@ -17,11 +17,11 @@
*/
package org.apache.beehive.netui.tags.divpanel;
-import org.apache.beehive.netui.pageflow.requeststate.INameable;
-import org.apache.beehive.netui.pageflow.requeststate.NameService;
-import
org.apache.beehive.netui.pageflow.interceptor.request.RequestInterceptorContext;
import org.apache.beehive.netui.pageflow.interceptor.InterceptorChain;
import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
+import
org.apache.beehive.netui.pageflow.interceptor.request.RequestInterceptorContext;
+import org.apache.beehive.netui.pageflow.requeststate.INameable;
+import org.apache.beehive.netui.pageflow.requeststate.NameService;
import org.apache.beehive.netui.tags.AbstractClientRequestInterceptor;
import javax.servlet.http.HttpServletRequest;
@@ -72,7 +72,7 @@
state.setFirstPage(fp);
}
- public void postRequest( RequestInterceptorContext context,
InterceptorChain chain ) throws InterceptorException
+ public void postRequest(RequestInterceptorContext context,
InterceptorChain chain) throws InterceptorException
{
chain.continueChain();
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
Thu Feb 24 06:53:25 2005
@@ -196,8 +196,8 @@
{
_popupSupport = new PopupSupport();
}
-
-
+
+
/**
* When true, this anchor will disable itself after being clicked.
* @param disableSecondClick - when true, this anchor will disable itself
after being clicked.
@@ -214,7 +214,7 @@
_disableSecondClick = disableSecondClick;
}
-
+
/**
* Sets the tabIndex of the rendered html tag.
* @param tabindex - the tab index.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
Thu Feb 24 06:53:25 2005
@@ -18,32 +18,27 @@
package org.apache.beehive.netui.tags.html;
import org.apache.beehive.netui.core.urls.URLRewriterService;
-import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.PageFlowUtils;
-import org.apache.beehive.netui.tags.ByRef;
+import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.tags.HtmlUtils;
import org.apache.beehive.netui.tags.IHtmlAccessable;
-import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
+import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
import org.apache.beehive.netui.tags.javascript.CoreScriptFeature;
import org.apache.beehive.netui.tags.javascript.IScriptReporter;
-import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
-import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
-import org.apache.beehive.netui.tags.rendering.InputSubmitTag;
-import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
-import org.apache.beehive.netui.tags.rendering.WriteRenderAppender;
-import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
+import org.apache.beehive.netui.tags.javascript.ScriptRequestState;
+import org.apache.beehive.netui.tags.rendering.*;
import org.apache.beehive.netui.util.Bundle;
import org.apache.beehive.netui.util.ParamHelper;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.struts.taglib.html.Constants;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
-import javax.servlet.ServletContext;
+import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
-import java.net.URISyntaxException;
/**
* Generates a button on the page with the specified attributes. The
@@ -76,7 +71,7 @@
implements IUrlParams, IHtmlAccessable, IHasPopupSupport
{
private static final Logger logger = Logger.getInstance(Button.class);
-
+
public static final String ACTION_OVERRIDE = "actionOverride:";
private InputSubmitTag.State _state = new InputSubmitTag.State();
@@ -196,7 +191,7 @@
{
_value = setNonEmptyValueAttribute(value);
}
-
+
/**
* Sets the popup indicator.
* @param popup - whether or not the button should open a popup window.
@@ -212,7 +207,7 @@
{
_popupSupport = new PopupSupport();
}
-
+
/**
* When true, this button will disable itself before submitting.
* @param disableSecondClick - when true, this button will disable itself
before submitting.
@@ -299,7 +294,7 @@
if (_popupSupport != null) {
_popupSupport.addParams(this, request);
}
-
+
if (_action != null) {
boolean isAction = PageFlowTagUtils.isAction(request, _action);
if (isAction) {
@@ -356,7 +351,7 @@
String entry;
if (parentForm != null && href != null && (_state.type == null
|| _state.type == INPUT_SUBMIT)) {
entry =
ScriptRequestState.getString("buttonDisableAndSubmitFormAction",
- new Object[]{parentForm.getRealFormId(), href});
+ new Object[]{parentForm.getRealFormId(), href});
buttonDisableAndSubmit = true;
}
else {
@@ -369,7 +364,7 @@
}
else if (_popupSupport != null) {
String href = getActionUrl(request, response);
-
+
if (href != null) {
href = response.encodeURL(href);
setOnClick(_popupSupport.getOnClick(href));
@@ -410,20 +405,21 @@
}
private String getActionUrl(HttpServletRequest request,
HttpServletResponse response)
- throws JspException
+ throws JspException
{
String href = null;
-
+
if (_action != null) {
ServletContext servletContext = pageContext.getServletContext();
boolean forXML = TagRenderingBase.Factory.isXHTML(request);
try {
href = PageFlowUtils.getRewrittenActionURI(servletContext,
request, response, _action, _params, null, forXML);
- } catch (URISyntaxException e) {
+ }
+ catch (URISyntaxException e) {
// report the error...
logger.error(Bundle.getString("Tags_URISyntaxException"));
String s = Bundle.getString("Tags_Button_URLException",
- new Object[]{_action,
e.getMessage()});
+ new Object[]{_action, e.getMessage()});
registerTagError(s, e);
}
}
@@ -431,11 +427,11 @@
Form parentForm = getNearestForm();
if (parentForm != null)
href = HtmlUtils.addParams(parentForm.getActionUrl(), _params,
response.getCharacterEncoding());
- }
-
+ }
+
return href;
}
-
+
/**
* Release any acquired resources.
*/
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java
Thu Feb 24 06:53:25 2005
@@ -296,7 +296,7 @@
* CheckBoxOptions.
* @param value Value to be compared
*/
- public boolean isMatched(String value,Boolean defaultValue)
+ public boolean isMatched(String value, Boolean defaultValue)
{
if (value == null)
return false;
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxOption.java
Thu Feb 24 06:53:25 2005
@@ -187,7 +187,7 @@
public int doStartTag() throws JspException
{
// verify that the parent is a CheckBoxGroup
- Tag parentTag = findAncestorWithClass(this,CheckBoxGroup.class);
+ Tag parentTag = findAncestorWithClass(this, CheckBoxGroup.class);
if (parentTag == null) {
String s = Bundle.getString("Tags_CheckBoxOptionNoCheckBoxGroup");
registerTagError(s, null);
@@ -232,7 +232,7 @@
// we verified that the parent was a CheckboxGroup in the doBeginTag()
ServletRequest req = pageContext.getRequest();
- CheckBoxGroup parent = (CheckBoxGroup)
findAncestorWithClass(this,CheckBoxGroup.class);
+ CheckBoxGroup parent = (CheckBoxGroup) findAncestorWithClass(this,
CheckBoxGroup.class);
ConstantRendering cr =
TagRenderingBase.Factory.getConstantRendering(req);
boolean repeat = parent.isRepeater();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ErrorBaseTag.java
Thu Feb 24 06:53:25 2005
@@ -31,14 +31,14 @@
import org.apache.struts.config.ControllerConfig;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.taglib.html.Constants;
-import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.RequestUtils;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.el.ELException;
-import javax.servlet.ServletContext;
import java.text.MessageFormat;
import java.util.Locale;
@@ -196,7 +196,7 @@
// First, look in the message bundle for any shared flow that was
involved in this request.
String sharedFlowModulePath =
InternalUtils.getForwardingModule(pageContext.getRequest());
- if (sharedFlowModulePath != null && (curModuleConfig == null || !
sharedFlowModulePath.equals(curModuleConfig.getPrefix()))) {
+ if (sharedFlowModulePath != null && (curModuleConfig == null ||
!sharedFlowModulePath.equals(curModuleConfig.getPrefix()))) {
ServletContext servletContext =
pageContext.getServletContext();
ModuleConfig sfModule =
InternalUtils.getModuleConfig(sharedFlowModulePath, servletContext);
if (requestedSpecificBundle ||
!isMissingUserDefaultMessages(sfModule)) {
@@ -206,7 +206,8 @@
Locale userLocale =
RequestUtils.retrieveUserLocale(pageContext, _locale);
if (messageArgs == null) {
message = resources.getMessage(userLocale, key);
- } else {
+ }
+ else {
message = resources.getMessage(userLocale, key,
messageArgs);
}
}
@@ -261,7 +262,7 @@
return message;
}
-
+
/**
* Tell whether the given Struts module has no default message bundle
defined.
* @return <code>true</code> if the given Struts module has no
user-specified default message bundle.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java
Thu Feb 24 06:53:25 2005
@@ -320,7 +320,7 @@
*/
public String getRealFormId()
{
- return _realName;
+ return _realName;
}
/**
@@ -502,7 +502,7 @@
throws JspException
{
_beanType = setRequiredValueAttribute(type, "beanType");
- _explicitBeanType=true;
+ _explicitBeanType = true;
}
/**
@@ -694,7 +694,7 @@
String id = _state.id;
_state.name = _realName;
_state.id = _realName;
- idScript = renderNameAndId(request,id);
+ idScript = renderNameAndId(request, id);
}
if (_state.method == null)
@@ -753,8 +753,7 @@
// add the extra hidden parameters
if (_extraHiddenParams != null && _extraHiddenParams.size() > 0) {
for (String name : _extraHiddenParams.keySet()) {
- for ( String value : _extraHiddenParams.get( name ) )
- {
+ for (String value : _extraHiddenParams.get(name)) {
writeHiddenParam(name, value, writer, request, true);
}
}
@@ -804,7 +803,7 @@
* @param id
* @return
*/
- private String renderNameAndId(HttpServletRequest request,String id)
+ private String renderNameAndId(HttpServletRequest request, String id)
{
// if id is not set then we need to exit
if (id == null)
@@ -898,14 +897,14 @@
boolean forXML = false;
if (_state.method != null && _state.method.equalsIgnoreCase(FORM_GET)
&& !URLRewriterService.allowParamsOnFormAction(servletContext,
request)) {
- extraHiddenParams.putAll( uri.getParameters() );
+ extraHiddenParams.putAll(uri.getParameters());
}
else {
// Params are allowed on the form action so see if this is for
XHTML
forXML = TagRenderingBase.Factory.isXHTML(request);
}
- String key = PageFlowUtils.getURLTemplateKey( URLType.ACTION,
needsToBeSecure );
+ String key = PageFlowUtils.getURLTemplateKey(URLType.ACTION,
needsToBeSecure);
String rewrittenURI = URLRewriterService.getTemplatedURL(request, uri,
key, forXML);
return rewrittenURI;
@@ -913,7 +912,7 @@
/**
* Get the generated action URL, based on the action attribute.
- */
+ */
String getActionUrl()
{
return _actionUrl;
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlConstants.java
Thu Feb 24 06:53:25 2005
@@ -370,7 +370,7 @@
* The name of the <code>scope</code> attribute.
*/
static final String SCOPE = "scope";
-
+
/**
* The name of the <code>shape</code> attribute.
*/
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlGroupBaseTag.java
Thu Feb 24 06:53:25 2005
@@ -89,7 +89,7 @@
* @param value
* @return boolean
*/
- public abstract boolean isMatched(String value,Boolean defaultValue);
+ public abstract boolean isMatched(String value, Boolean defaultValue);
/**
* Base support for the attribute tag. This is overridden to prevent
setting the <code>href</code>
@@ -512,7 +512,7 @@
_inputState.style = _style;
_inputState.styleClass = _class;
- if (isMatched(optionValue,null)) {
+ if (isMatched(optionValue, null)) {
_inputState.checked = true;
}
_inputState.disabled = isDisabled();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
Thu Feb 24 06:53:25 2005
@@ -121,7 +121,7 @@
// push the evaluated expression when we are not client side bound...
labelValue = (usingDefault && !_formatDefaultValue) ?
- labelObject.toString() : formatText(labelObject) ;
+ labelObject.toString() : formatText(labelObject);
if (hasErrors())
return reportAndExit(EVAL_PAGE);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonOption.java
Thu Feb 24 06:53:25 2005
@@ -152,8 +152,8 @@
public int doStartTag() throws JspException
{
- Tag parentTag = findAncestorWithClass(this,RadioButtonGroup.class);
- if (parentTag == null) {
+ Tag parentTag = findAncestorWithClass(this, RadioButtonGroup.class);
+ if (parentTag == null) {
String s =
Bundle.getString("Tags_RadioButtonOptionNoRadioButtonGroup");
registerTagError(s, null);
return SKIP_BODY;
@@ -199,7 +199,7 @@
ConstantRendering cr =
TagRenderingBase.Factory.getConstantRendering(req);
// this was verified in doBeginTag
- RadioButtonGroup parent = (RadioButtonGroup)
findAncestorWithClass(this,RadioButtonGroup.class);
+ RadioButtonGroup parent = (RadioButtonGroup)
findAncestorWithClass(this, RadioButtonGroup.class);
assert(parent != null);
boolean repeat = parent.isRepeater();
@@ -220,7 +220,7 @@
}
// @todo: why is this a Boolean?
- _state.checked = new
Boolean(parent.isMatched(_state.value,null)).booleanValue();
+ _state.checked = new Boolean(parent.isMatched(_state.value,
null)).booleanValue();
_state.disabled = isDisabled();
if (!_state.disabled)
_state.disabled = parent.isDisabled();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java
Thu Feb 24 06:53:25 2005
@@ -99,8 +99,8 @@
}
URLRewriterService.rewriteURL(context, request, response, uri,
URLType.ACTION, needsToBeSecure);
- String key = PageFlowUtils.getURLTemplateKey( URLType.ACTION,
needsToBeSecure );
- boolean forXML = TagRenderingBase.Factory.isXHTML( request );
+ String key = PageFlowUtils.getURLTemplateKey(URLType.ACTION,
needsToBeSecure);
+ boolean forXML = TagRenderingBase.Factory.isXHTML(request);
String uriString = URLRewriterService.getTemplatedURL(request,
uri, key, forXML);
write(response.encodeURL(uriString));
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java
Thu Feb 24 06:53:25 2005
@@ -27,8 +27,8 @@
import org.apache.beehive.netui.tags.naming.PrefixNameInterceptor;
import org.apache.beehive.netui.tags.rendering.*;
import org.apache.beehive.netui.util.Bundle;
-import org.apache.beehive.netui.util.iterator.IteratorFactory;
import org.apache.beehive.netui.util.iterator.ArrayIterator;
+import org.apache.beehive.netui.util.iterator.IteratorFactory;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletRequest;
@@ -215,10 +215,14 @@
public String toString()
{
switch (this) {
- case OPTION: return REPEATING_OPTION;
- case DEFAULT: return REPEATING_DEFAULT;
- case DATASOURCE: return REPEATING_DATASOURCE;
- case NULL: return REPEATING_NULL;
+ case OPTION:
+ return REPEATING_OPTION;
+ case DEFAULT:
+ return REPEATING_DEFAULT;
+ case DATASOURCE:
+ return REPEATING_DATASOURCE;
+ case NULL:
+ return REPEATING_NULL;
default:
return "Unknown Stage";
}
@@ -246,11 +250,11 @@
/**
* This defines the default order of processing the options when repeating.
*/
- private static final RepeatingStages[] DEFAULT_ORDER =
{RepeatingStages.BEFORE,
-
RepeatingStages.OPTION,
-
RepeatingStages.DATASOURCE,
-
RepeatingStages.DEFAULT,
-
RepeatingStages.NULL};
+ private static final RepeatingStages[] DEFAULT_ORDER =
{RepeatingStages.BEFORE,
+
RepeatingStages.OPTION,
+
RepeatingStages.DATASOURCE,
+
RepeatingStages.DEFAULT,
+
RepeatingStages.NULL};
/**
* Default value of the options <code>value</code> attribute.
@@ -465,21 +469,21 @@
* @param order - comma separated ordering of items when there is a
repeating select.
* @netui:attribute required="false" rtexprvalue="true"
* description="Define the order of options for a repeating Select"
- */
+ */
public void setRepeatingOrder(String order)
- throws JspException
+ throws JspException
{
String[] options = order.split(",");
- for (int i=0;i<options.length;i++) {
+ for (int i = 0; i < options.length; i++) {
System.err.println("Option:" + options[i]);
}
- RepeatingStages[] stageOrder = new RepeatingStages[options.length+1];
+ RepeatingStages[] stageOrder = new RepeatingStages[options.length + 1];
stageOrder[0] = RepeatingStages.BEFORE;
- for (int i=0;i<options.length;i++) {
+ for (int i = 0; i < options.length; i++) {
String opt = options[i].trim();
- stageOrder[i+1] = RepeatingStages.parseString(opt);
- if (stageOrder[i+1] == null) {
- String s = Bundle.getString("Tags_SelectBadRepeatingStage",
new Object[] {opt});
+ stageOrder[i + 1] = RepeatingStages.parseString(opt);
+ if (stageOrder[i + 1] == null) {
+ String s = Bundle.getString("Tags_SelectBadRepeatingStage",
new Object[]{opt});
registerTagError(s, null);
}
}
@@ -659,7 +663,8 @@
* Return the enum value of the currently repeating stage.
* @return The currently repeating stage.
*/
- public RepeatingStages getRepeatingStage() {
+ public RepeatingStages getRepeatingStage()
+ {
return _repCurStage;
}
@@ -667,7 +672,8 @@
* Boolean indicating that we are processing the optionsDataSource.
* @return <code>true</code> if we are processing the optionsDataSource.
*/
- public boolean isOptionStage() {
+ public boolean isOptionStage()
+ {
return _repCurStage == RepeatingStages.OPTION;
}
@@ -675,7 +681,8 @@
* Boolean indicating that we are processing the defaultValue.
* @return <code>true</code> if we are processing the defaultValue.
*/
- public boolean isDefaultStage() {
+ public boolean isDefaultStage()
+ {
return _repCurStage == RepeatingStages.DEFAULT;
}
@@ -683,7 +690,8 @@
* Boolean indicating that we are processing the dataSource.
* @return <code>true</code> if we are processing the dataSource.
*/
- public boolean isDataSourceStage() {
+ public boolean isDataSourceStage()
+ {
return _repCurStage == RepeatingStages.DATASOURCE;
}
@@ -691,7 +699,8 @@
* Boolean indicating that we are processing the defined null value.
* @return <code>true</code> if we are processing the defined null value.
*/
- public boolean isNullStage() {
+ public boolean isNullStage()
+ {
return _repCurStage == RepeatingStages.NULL;
}
@@ -943,17 +952,17 @@
* is set to the next item in the iteration set. It will return
<code>true</code>
* if there is a next item, and <code>false</code> when we are done with
the iteration
* @return returns <code>true</code> when <code>_repCurItem</code>
contains the next item and
- * <code>false</code> when we are done.
+ * <code>false</code> when we are done.
* @throws JspException
*/
private boolean doRepeaterAfterBody()
- throws JspException
+ throws JspException
{
switch (_repCurStage) {
- case BEFORE:
+ case BEFORE:
moveNext();
return doRepeaterAfterBody();
- case OPTION:
+ case OPTION:
assert (_repeaterIterator instanceof Iterator);
while (_repeaterIterator.hasNext()) {
_repCurItem = _repeaterIterator.next();
@@ -993,7 +1002,7 @@
* @throws JspException
*/
private boolean moveNext()
- throws JspException
+ throws JspException
{
// increment the current position, if we are beyond the end of the
array return
_repIdx++;
@@ -1007,9 +1016,9 @@
// process each type of iteration...
// Each will recursively call moveNext, if that stage doesn't support
iteration
switch (_repCurStage) {
- case BEFORE:
- break;
- case OPTION:
+ case BEFORE:
+ break;
+ case OPTION:
// This produces an error if the optionsDataSource is an
instance of an iterator
if (!(_dynamicOptions instanceof Iterator)) {
String s = Bundle.getString("Tags_OptionsDSIteratorError");
@@ -1021,18 +1030,18 @@
_repeaterIterator = (Iterator) _dynamicOptions;
break;
- case DEFAULT:
+ case DEFAULT:
if (_defaultSelections != null)
_repeaterIterator = _defaultSelections.iterator();
break;
- case DATASOURCE:
+ case DATASOURCE:
if (_match != null)
_repeaterIterator = Arrays.asList(_match).iterator();
break;
- case NULL:
+ case NULL:
if (_nullable)
_repeaterIterator = new ArrayIterator(NULL_INSTANCE);
- break;
+ break;
}
// return true when we set the iterator, otherwise move to the next
stage.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
Thu Feb 24 06:53:25 2005
@@ -157,7 +157,7 @@
// push the evaluated expression when we are not client side bound...
String labelValue = (usingDefault && !_formatDefaultValue) ?
- labelObject.toString() : formatText(labelObject) ;
+ labelObject.toString() : formatText(labelObject);
// if there were errors in the formatters, report them.
if (_formatterErrors) {
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/PageFlowTagUtils.java
Thu Feb 24 06:53:25 2005
@@ -62,7 +62,7 @@
ServletContext servletContext = pageContext.getServletContext();
HttpServletRequest request = (HttpServletRequest)
pageContext.getRequest();
HttpServletResponse response = (HttpServletResponse)
pageContext.getResponse();
- boolean forXML = TagRenderingBase.Factory.isXHTML( request );
+ boolean forXML = TagRenderingBase.Factory.isXHTML(request);
return PageFlowUtils.getRewrittenActionURI(servletContext, request,
response, action, params, location, forXML);
}
@@ -75,9 +75,8 @@
* @param params the query parameters for this url.
* @param location the location (anchor or fragment) for this url.
* @return a url that has been run through the URL rewriter service.
- *
* @see PageFlowUtils#getRewrittenHrefURI(javax.servlet.ServletContext,
javax.servlet.http.HttpServletRequest,
- * javax.servlet.http.HttpServletResponse, String,
java.util.Map, String, boolean)
+ * javax.servlet.http.HttpServletResponse, String,
java.util.Map, String, boolean)
*/
public static String rewriteHrefURL(PageContext pageContext, String url,
Map params, String location)
throws URISyntaxException
@@ -85,7 +84,7 @@
ServletContext servletContext = pageContext.getServletContext();
HttpServletRequest request = (HttpServletRequest)
pageContext.getRequest();
HttpServletResponse response = (HttpServletResponse)
pageContext.getResponse();
- boolean forXML = TagRenderingBase.Factory.isXHTML( request );
+ boolean forXML = TagRenderingBase.Factory.isXHTML(request);
return PageFlowUtils.getRewrittenHrefURI(servletContext, request,
response, url, params, location, forXML);
}
@@ -98,9 +97,8 @@
* @param params the query parameters for this url.
* @param location the location (anchor or fragment) for this url.
* @return a url that has been run through the URL rewriter service.
- *
* @see
PageFlowUtils#getRewrittenResourceURI(javax.servlet.ServletContext,
javax.servlet.http.HttpServletRequest,
- * javax.servlet.http.HttpServletResponse, String,
java.util.Map, String, boolean)
+ * javax.servlet.http.HttpServletResponse, String,
java.util.Map, String, boolean)
*/
public static String rewriteResourceURL(PageContext pageContext, String
url, Map params, String location)
throws URISyntaxException
@@ -108,7 +106,7 @@
ServletContext servletContext = pageContext.getServletContext();
HttpServletRequest request = (HttpServletRequest)
pageContext.getRequest();
HttpServletResponse response = (HttpServletResponse)
pageContext.getResponse();
- boolean forXML = TagRenderingBase.Factory.isXHTML( request );
+ boolean forXML = TagRenderingBase.Factory.isXHTML(request);
return PageFlowUtils.getRewrittenResourceURI(servletContext, request,
response, url, params, location, forXML);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptContainer.java
Thu Feb 24 06:53:25 2005
@@ -98,7 +98,7 @@
assert (script != null) : "The paramter 'script' must not be null";
IScriptReporter sr = getParentScriptReporter();
if (sr != null) {
- sr.addScriptFunction(placement,script);
+ sr.addScriptFunction(placement, script);
return;
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptHeader.java
Thu Feb 24 06:53:25 2005
@@ -58,7 +58,7 @@
// write out the include
ScriptTag.State state = new ScriptTag.State();
TagRenderingBase br =
TagRenderingBase.Factory.getRendering(TagRenderingBase.SCRIPT_TAG,
pageContext.getRequest());
-
+
state.src = req.getContextPath() +
"/resources/beehive/version1/javascript/netui-tree.js";
br.doStartTag(writer, state);
br.doEndTag(writer);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/StringBuilderRenderAppender.java
Thu Feb 24 06:53:25 2005
@@ -52,7 +52,8 @@
_sb.append(c);
}
- public String toString() {
+ public String toString()
+ {
return _sb.toString();
}
}
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=155187&r2=155188
==============================================================================
---
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
Thu Feb 24 06:53:25 2005
@@ -25,7 +25,7 @@
*
*/
public abstract class TBodyTag
- extends TagHtmlBase
+ extends TagHtmlBase
{
public static void add(HashMap html, HashMap htmlQuirks, HashMap xhtml)
@@ -36,7 +36,7 @@
}
public static class State
- extends AbstractHtmlState
+ extends AbstractHtmlState
{
public void clear()
{
@@ -45,8 +45,8 @@
}
private static class Rendering
- extends TBodyTag
- implements HtmlConstants
+ extends TBodyTag
+ implements HtmlConstants
{
// @todo: need to support %coreattrs, %i18n, %events, %cellhalign,
%cellvalign on <tbody>
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ITreeRootElement.java
Thu Feb 24 06:53:25 2005
@@ -43,7 +43,7 @@
* be used for delegation. This requires the root, the currently selected
node,
* and will return the newly selected node.
* @param selectNode a String value name of the new node selected
- * @param request the ServletRequest.
+ * @param request the ServletRequest.
*/
void changeSelected(String selectNode, ServletRequest request);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ServletTreeRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ServletTreeRenderer.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ServletTreeRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/ServletTreeRenderer.java
Thu Feb 24 06:53:25 2005
@@ -21,9 +21,9 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.util.logging.Logger;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
import javax.servlet.jsp.JspException;
public class ServletTreeRenderer extends TreeRenderer
@@ -32,24 +32,24 @@
AbstractRenderAppender _writer;
StringBuilder _sb;
- ServletTreeRenderer(TreeRenderState trs,HttpServletRequest request,
- HttpServletResponse response, ServletContext servletContext,
- AbstractRenderAppender writer, StringBuilder sb)
+ ServletTreeRenderer(TreeRenderState trs, HttpServletRequest request,
+ HttpServletResponse response, ServletContext
servletContext,
+ AbstractRenderAppender writer, StringBuilder sb)
{
- super(trs,request,response,servletContext);
+ super(trs, request, response, servletContext);
_writer = writer;
_sb = sb;
}
- protected void renderBeforeNode(AbstractRenderAppender writer,TreeElement
node)
+ protected void renderBeforeNode(AbstractRenderAppender writer, TreeElement
node)
{
writer.append("<![CDATA[");
}
- protected void renderAfterNode(AbstractRenderAppender writer,TreeElement
node)
+ protected void renderAfterNode(AbstractRenderAppender writer, TreeElement
node)
{
writer.append("]]>");
- TreeCRI.writeElement(_writer, "treeDiv",writer.toString().trim());
+ TreeCRI.writeElement(_writer, "treeDiv", writer.toString().trim());
_sb.setLength(0);
}
@@ -61,10 +61,10 @@
* @throws JspException
*/
protected void registerTagError(String message, Throwable e)
- throws JspException
+ throws JspException
{
System.err.println("Error in rendering tree:" + message);
- logger.error(message,e);
+ logger.error(message, e);
}
protected String renderTagId(HttpServletRequest request, String tagId,
AbstractHtmlState state)
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TagTreeRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TagTreeRenderer.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TagTreeRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TagTreeRenderer.java
Thu Feb 24 06:53:25 2005
@@ -11,22 +11,22 @@
{
private Tree _tree;
- TagTreeRenderer(Tree tree,TreeRenderState trs,HttpServletRequest request,
- HttpServletResponse response, ServletContext servletContext)
+ TagTreeRenderer(Tree tree, TreeRenderState trs, HttpServletRequest request,
+ HttpServletResponse response, ServletContext
servletContext)
{
- super(trs,request,response,servletContext);
+ super(trs, request, response, servletContext);
_tree = tree;
}
protected void registerTagError(String message, Throwable e)
- throws JspException
+ throws JspException
{
- _tree.registerTagError(message,e);
+ _tree.registerTagError(message, e);
}
protected String renderTagId(HttpServletRequest request, String tagId,
AbstractHtmlState state)
{
- return _tree.renderTagId(request,tagId,state);
+ return _tree.renderTagId(request, tagId, state);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
Thu Feb 24 06:53:25 2005
@@ -416,6 +416,7 @@
{
_rootNodeExpandedImage =
setNonEmptyValueAttribute(rootNodeExpandedImage);
}
+
/**
* @param runAtClient
* @netui:attribute required="false" rtexprvalue="false"
@@ -598,7 +599,6 @@
* an expression. The <code>facet</code> is optional and may be used by
complex types to
* target the attribute to a sub part of the generated markup. This method
may result in errors
* being generated.
- *
* @param name The name of the attribute. This value may not be null or
the empty string.
* @param value The value of the attribute. This may contain an
expression.
* @param facet The name of a facet to which the attribute will be
applied. This is optional.
@@ -777,12 +777,12 @@
ITreeRootElement tre = (ITreeRootElement) treeRoot;
Object[] args = new Object[6];
- args[0] = _iState.getImageRoot() + "/";
- args[1] = tre.getObjectName();
- args[2] = _iState.getNodeCollapsedImage();
- args[3] = _iState.getNodeExpandedImage();
- args[4] = _iState.getLastNodeCollapsedImage();
- args[5] = _iState.getLastNodeExpandedImage();
+ args[0] = _iState.getImageRoot() + "/";
+ args[1] = tre.getObjectName();
+ args[2] = _iState.getNodeCollapsedImage();
+ args[3] = _iState.getNodeExpandedImage();
+ args[4] = _iState.getLastNodeCollapsedImage();
+ args[5] = _iState.getLastNodeExpandedImage();
srs.writeFeature(sr, writer, CoreScriptFeature.TREE_INIT, false,
false, args);
tre.setTreeRenderState(_trs);
@@ -810,7 +810,7 @@
// Render the tree.
AttributeRenderer extraAttrs = new AttributeRenderer();
- TagTreeRenderer ttr = new
TagTreeRenderer(this,_trs,request,response,pageContext.getServletContext());
+ TagTreeRenderer ttr = new TagTreeRenderer(this, _trs, request,
response, pageContext.getServletContext());
ttr.render(sb, treeRoot, 0, extraAttrs, _iState);
if (hasErrors()) {
reportErrors();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeCRI.java
Thu Feb 24 06:53:25 2005
@@ -17,12 +17,12 @@
*/
package org.apache.beehive.netui.tags.tree;
-import
org.apache.beehive.netui.pageflow.interceptor.request.RequestInterceptor;
-import
org.apache.beehive.netui.pageflow.interceptor.request.RequestInterceptorContext;
import org.apache.beehive.netui.pageflow.interceptor.InterceptorChain;
import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
-import org.apache.beehive.netui.pageflow.requeststate.NameService;
+import
org.apache.beehive.netui.pageflow.interceptor.request.RequestInterceptor;
+import
org.apache.beehive.netui.pageflow.interceptor.request.RequestInterceptorContext;
import org.apache.beehive.netui.pageflow.requeststate.INameable;
+import org.apache.beehive.netui.pageflow.requeststate.NameService;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
import org.apache.beehive.netui.util.logging.Logger;
@@ -57,7 +57,7 @@
int dot = cmd.lastIndexOf('.');
int slash = cmd.lastIndexOf('/');
if (slash != -1 && slash != -1) {
- cmd = cmd.substring(slash+1,dot);
+ cmd = cmd.substring(slash + 1, dot);
}
}
catch (RuntimeException e) {
@@ -71,11 +71,11 @@
else if (TREE_EXPAND.equals(cmd)) {
handleExpandCollapse(true, request, ctxt.getResponse(),
ctxt.getServletContext());
}
-
+
chain.continueChain();
}
- public void postRequest( RequestInterceptorContext context,
InterceptorChain chain ) throws InterceptorException
+ public void postRequest(RequestInterceptorContext context,
InterceptorChain chain) throws InterceptorException
{
chain.continueChain();
}
@@ -116,10 +116,10 @@
StringBuilder sb = new StringBuilder(1024);
StringBuilderRenderAppender writer = new
StringBuilderRenderAppender(sb);
// Start the document
- writeStartElement(writer,TREE_EXPAND_ELEM);
+ writeStartElement(writer, TREE_EXPAND_ELEM);
// add a tree identifier
- writeElement(writer, "node",node);
+ writeElement(writer, "node", node);
try {
TreeElement children[] = elem.getChildren();
@@ -137,8 +137,8 @@
iState = root.getInheritableState();
}
- ServletTreeRenderer str = new
ServletTreeRenderer(root.getTreeRenderState(),req,
- (HttpServletResponse) response,ctxt,writer,treeRendering);
+ ServletTreeRenderer str = new
ServletTreeRenderer(root.getTreeRenderState(), req,
+ (HttpServletResponse) response, ctxt, writer,
treeRendering);
for (int i = 0; i < children.length; i++) {
treeRendering.setLength(0);
str.render(treeRendering, children[i], newLevel,
extraAttrs, iState);
@@ -146,22 +146,22 @@
}
catch (JspException se) {
se.printStackTrace();
- logger.error("Received a JSP excpetion Rendering the Tree",se);
+ logger.error("Received a JSP excpetion Rendering the Tree",
se);
return;
}
catch (RuntimeException re) {
//re.printStackTrace();
- logger.error("Received a JSP excpetion Rendering the Tree",re);
+ logger.error("Received a JSP excpetion Rendering the Tree",
re);
return;
}
// add the tree text
- writeEndElement(writer,TREE_EXPAND_ELEM);
- write(response,sb.toString());
+ writeEndElement(writer, TREE_EXPAND_ELEM);
+ write(response, sb.toString());
}
}
- public static void writeStartElement(AbstractRenderAppender writer,String
elementName)
+ public static void writeStartElement(AbstractRenderAppender writer, String
elementName)
{
writer.append("<");
writer.append(elementName);
@@ -169,18 +169,18 @@
}
- public static void writeEndElement(AbstractRenderAppender writer,String
elementName)
+ public static void writeEndElement(AbstractRenderAppender writer, String
elementName)
{
writer.append("</");
writer.append(elementName);
writer.append(">");
}
- public static void writeElement(AbstractRenderAppender writer, String
elementName, String value)
+ public static void writeElement(AbstractRenderAppender writer, String
elementName, String value)
{
- writeStartElement(writer,elementName);
+ writeStartElement(writer, elementName);
writer.append(value);
- writeEndElement(writer,elementName);
+ writeEndElement(writer, elementName);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
Thu Feb 24 06:53:25 2005
@@ -17,8 +17,8 @@
*/
package org.apache.beehive.netui.tags.tree;
-import org.apache.beehive.netui.tags.html.IUrlParams;
import org.apache.beehive.netui.tags.HtmlUtils;
+import org.apache.beehive.netui.tags.html.IUrlParams;
import org.apache.beehive.netui.util.ParamHelper;
import javax.servlet.ServletRequest;
@@ -57,7 +57,7 @@
public static final String TREE_EXPAND_STATE = "expand";
public static final String TREE_COLLAPSE_STATE = "collapse";
public static final String TREE_LEVEL = "netui:treeLevel";
-
+
public static final String TREE_EXPAND_IMAGE = "netui:imageExpand";
public static final String TREE_COLLAPSE_IMAGE = "netui:imageCollapse";
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHelpers.java
Thu Feb 24 06:53:25 2005
@@ -19,8 +19,8 @@
import org.apache.beehive.netui.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
/**
@@ -49,7 +49,7 @@
if (selectNode != null) {
if (treeRoot instanceof ITreeRootElement) {
ITreeRootElement root = (ITreeRootElement) treeRoot;
- root.changeSelected(selectNode,request);
+ root.changeSelected(selectNode, request);
}
else {
setSelected(treeRoot, selectNode, request);
@@ -142,10 +142,10 @@
* This is a helper method that will change the selected node. This is
provided to
* make implementation of ITreeRootElement easier. This is called by the
<code>changeSelected</code>
* method there to do the work of changing the selected node.
- * @param root The root of the tree
+ * @param root The root of the tree
* @param selectedNode The node that is currently selected, it may be null
- * @param selectNode The String name of the node that will be selected
- * @param request The ServletRequest
+ * @param selectNode The String name of the node that will be selected
+ * @param request The ServletRequest
* @return a TreeElement representing the new node selected.
*/
public static TreeElement changeSelected(TreeElement root, TreeElement
selectedNode, String selectNode, ServletRequest request)
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
Thu Feb 24 06:53:25 2005
@@ -249,7 +249,8 @@
_state = state;
}
- public void setAddedChild() {
+ public void setAddedChild()
+ {
_child = true;
}
@@ -275,7 +276,7 @@
public void addParameter(String name, Object value, String facet) throws
JspException
{
- _treeElement.addParameter(name,value,facet);
+ _treeElement.addParameter(name, value, facet);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
Thu Feb 24 06:53:25 2005
@@ -18,10 +18,10 @@
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;
import java.io.IOException;
-import org.apache.beehive.netui.util.logging.Logger;
/**
* @netui:tag name="treeLabel" body-content="scriptless" description="Set the
label for the parent TreeItem."
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
Thu Feb 24 06:53:25 2005
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.tags.tree;
public class TreeRenderState implements java.io.Serializable
- {
+{
public String selectedStyle; // selection style
public String selectedStyleClass; // selection class
public String unselectedStyle; // unselect style
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
Thu Feb 24 06:53:25 2005
@@ -69,15 +69,15 @@
}
abstract protected void registerTagError(String message, Throwable e)
- throws JspException;
+ throws JspException;
abstract protected String renderTagId(HttpServletRequest request, String
tagId, AbstractHtmlState state);
- protected void renderBeforeNode(AbstractRenderAppender writer,TreeElement
node)
+ protected void renderBeforeNode(AbstractRenderAppender writer, TreeElement
node)
{
}
- protected void renderAfterNode(AbstractRenderAppender writer,TreeElement
node)
+ protected void renderAfterNode(AbstractRenderAppender writer, TreeElement
node)
{
}
@@ -139,7 +139,7 @@
}
sb.append(" ");
StringBuilderRenderAppender writer = new
StringBuilderRenderAppender(sb);
- renderBeforeNode(writer,node);
+ renderBeforeNode(writer, node);
_divRenderer.doStartTag(writer, _divState);
sb.append("\n");
if (script != null)
@@ -319,7 +319,7 @@
String uri = null;
try {
boolean xml = TagRenderingBase.Factory.isXHTML(_req);
- uri =
PageFlowUtils.getRewrittenActionURI(_servletContext,_req,_res,action,params,null,xml);
+ uri = PageFlowUtils.getRewrittenActionURI(_servletContext,
_req, _res, action, params, null, xml);
}
catch (URISyntaxException e) {
// report the error...
@@ -368,7 +368,7 @@
_anchorState.styleClass = _trs.unselectedStyleClass;
}
if (_anchorState.style == null && _anchorState.styleClass == null)
{
- _anchorState.style="text-decoration: none";
+ _anchorState.style = "text-decoration: none";
}
// render any attributes applied to the HTML
@@ -466,7 +466,7 @@
sb.append("\n ");
_divRenderer.doEndTag(writer);
sb.append("\n");
- renderAfterNode(writer,node);
+ renderAfterNode(writer, node);
// now remove all of the attributes scoped with this...
@@ -507,7 +507,7 @@
String uri = null;
try {
boolean xml = TagRenderingBase.Factory.isXHTML(_req);
- uri =
PageFlowUtils.getRewrittenActionURI(_servletContext,_req,_res,action,params,null,xml);
+ uri = PageFlowUtils.getRewrittenActionURI(_servletContext, _req,
_res, action, params, null, xml);
}
catch (URISyntaxException e) {
// report the error...
@@ -547,7 +547,7 @@
_anchorState.href = "";
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_ANCHOR,
(expanded ? TreeElement.TREE_EXPAND_STATE :
TreeElement.TREE_COLLAPSE_STATE));
- _anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_ANCHOR_INIT,"true");
+ _anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_ANCHOR_INIT, "true");
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_ANCHOR_ID, encodedNodeName);
if (node.isLast()) {
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_NODE_LAST, "true");
@@ -559,18 +559,18 @@
String rootImg = ((ITreeRootElement)
node).getRootNodeCollapsedImage();
if (rootImg != null)
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_COLLAPSE_IMAGE,
- state.getImageRoot() + "/" + rootImg);
+ state.getImageRoot() + "/" + rootImg);
else
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_COLLAPSE_IMAGE,
state.getImageRoot() + "/" +
state.getLastNodeCollapsedImage());
rootImg = ((ITreeRootElement)
node).getRootNodeExpandedImage();
if (rootImg != null)
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_EXPAND_IMAGE,
- state.getImageRoot() + "/" + rootImg);
+ state.getImageRoot() + "/" + rootImg);
else
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_EXPAND_IMAGE,
state.getImageRoot() + "/" +
state.getLastNodeExpandedImage());
- }
+ }
else if (node.isLast()) {
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_COLLAPSE_IMAGE,
state.getImageRoot() + "/" +
state.getLastNodeCollapsedImage());
@@ -589,7 +589,7 @@
String path = _req.getServletPath();
int idx = path.lastIndexOf('/');
if (idx != -1) {
- path = path.substring(1,idx);
+ path = path.substring(1, idx);
}
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_EXPAND, "true");
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
TreeElement.TREE_EXPAND_PATH, path);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java?view=diff&r1=155187&r2=155188
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRootElement.java
Thu Feb 24 06:53:25 2005
@@ -59,7 +59,7 @@
*/
public void changeSelected(String selectNode, ServletRequest request)
{
- _selectedNode =
TreeHelpers.changeSelected(this,_selectedNode,selectNode,request);
+ _selectedNode = TreeHelpers.changeSelected(this, _selectedNode,
selectNode, request);
}
/**
@@ -76,7 +76,8 @@
* return the TreeRenderState for this tree.
* @return the <code>TreeRenderState</code>
*/
- public TreeRenderState getTreeRenderState() {
+ public TreeRenderState getTreeRenderState()
+ {
return _trs;
}
@@ -84,7 +85,8 @@
* Set the TreeRenderState
* @param trs
*/
- public void setTreeRenderState(TreeRenderState trs) {
+ public void setTreeRenderState(TreeRenderState trs)
+ {
_trs = trs;
}
@@ -103,7 +105,7 @@
*/
public void setInheritableState(InheritableState state)
{
- _state = state;
+ _state = state;
}
/**
@@ -118,7 +120,7 @@
/**
* Sets the expanded image for the root node.
* @param rootNodeExpandedImage the name of the image to display. This
will be searched
- * for below the image root.
+ * for below the image root.
*/
public void setRootNodeExpandedImage(String rootNodeExpandedImage)
{
@@ -137,7 +139,7 @@
/**
* Sets the name of the collapsed image for the root node.
* @param rootNodeCollapsedImage the name of the collapsed image to
display. This will be searched
- * for below the image root.
+ * for below the image root.
*/
public void setRootNodeCollapsedImage(String rootNodeCollapsedImage)
{
