Author: dolander
Date: Sat Jan 15 07:59:49 2005
New Revision: 125265
URL: http://svn.apache.org/viewcvs?view=rev&rev=125265
Log:
Rename the URLParams interface to IUrlParams
Rename the Formattable interface to IFormattable
Added:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IFormattable.java
- copied, changed from r125250,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java
- copied, changed from r125250,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
Removed:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.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/CheckBox.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/FormatDate.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.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/LabelBase.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.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/html/TextArea.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.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/TreePropertyOverride.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
Sat Jan 15 07:59:49 2005
@@ -118,7 +118,7 @@
if(sort.getSortExpression().equals(sortExpression)) {
if(sortDirection != SortDirection.NONE)
/* todo: broke encapsulation here. bad bad bad. */
- /* @todo: need to move this parameter handling into
some sort of URLParams class that can be *fast* */
+ /* @todo: need to move this parameter handling into
some sort of IUrlParams class that can be *fast* */
valueList.add(DefaultSort.writeSortParam(_namespace,
sort.getSortExpression(), sortDirection));
}
else valueList.add(sort.write(_namespace));
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
Sat Jan 15 07:59:49 2005
@@ -27,7 +27,7 @@
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
-import org.apache.beehive.netui.tags.html.Formattable;
+import org.apache.beehive.netui.tags.html.IFormattable;
import org.apache.beehive.netui.tags.html.FormatTag.Formatter;
import org.apache.beehive.netui.util.logging.Logger;
@@ -36,7 +36,7 @@
*/
public abstract class AbstractColumn
extends AbstractSimpleTag
- implements Formattable {
+ implements IFormattable {
private static final Logger LOGGER =
Logger.getInstance(AbstractColumn.class);
private static final String EMPTY_CELL = " ";
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
Sat Jan 15 07:59:49 2005
@@ -22,7 +22,7 @@
import
org.apache.beehive.netui.databinding.datagrid.model.cell.AnchorCellModel;
import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import
org.apache.beehive.netui.databinding.datagrid.rendering.cell.AnchorCellDecorator;
-import org.apache.beehive.netui.tags.html.URLParams;
+import org.apache.beehive.netui.tags.html.IUrlParams;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.util.ParamHelper;
@@ -36,7 +36,7 @@
*/
public class AnchorColumn
extends AbstractHtmlColumn
- implements URLParams {
+ implements IUrlParams {
private static final AnchorCellDecorator DECORATOR = new
AnchorCellDecorator();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java
Sat Jan 15 07:59:49 2005
@@ -84,6 +84,5 @@
else {
javascriptMode = JspTagConfig.IdJavascript.INT_DEFAULT;
}
- System.err.println("Javascript Mode:" + javascriptMode);
}
}
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -28,7 +28,7 @@
* This may not be the best OO design, but the design is optimized for
performance of rendering anchor elements.
*/
abstract public class AnchorBase extends HtmlBaseTag
- implements URLParams
+ implements IUrlParams
{
private static final String REQUIRED_ATTR = "href, action, linkName,
clientAction";
private static final Logger logger = Logger.getInstance(AnchorBase.class);
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -65,7 +65,7 @@
*/
public class Button
extends HtmlFocusBaseTag
- implements URLParams, IHtmlAccessable
+ implements IUrlParams, IHtmlAccessable
{
public static final String ACTION_OVERRIDE = "actionOverride:";
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java
Sat Jan 15 07:59:49 2005
@@ -120,8 +120,6 @@
public void process(HttpServletRequest request, String key, String
expr,
ProcessPopulate.ExpressionUpdateNode node)
{
- //System.err.println("CheckBox-process: '" + key + "' expr: '" +
expr + "'");
-
String returnVal = null;
if (!key.endsWith(OLDVALUE_SUFFIX)) {
//This checkbox is true and should stay that way
@@ -139,13 +137,11 @@
}
}
- //System.err.println("node.expression:" + node.expression);
-
if (node.expression.endsWith(OLDVALUE_SUFFIX)) {
node.expression = node.expression.substring(0,
node.expression.indexOf(OLDVALUE_SUFFIX));
}
- //System.err.println("Return Value:" + returnVal);
+
node.values = new String[]{returnVal};
if (logger.isDebugEnabled()) {
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -195,7 +195,7 @@
*
expressioninfo="workshop.netui.jspdesigner.tldx.expression.NetuiActionFormExpressionInfo"
*/
public class Form extends HtmlBaseTag
- implements URLParams
+ implements IUrlParams
{
/**
* This is the name of the counter stored in the request used to genereate
the
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatDate.java
Sat Jan 15 07:59:49 2005
@@ -228,20 +228,20 @@
public void doTag()
throws JspException
{
- JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
Formattable.class);
+ JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
IFormattable.class);
// if there are errors we need to either add these to the parent
AbstractBastTag or report an error.
if (hasErrors()) {
- if (parentTag instanceof Formattable) {
- Formattable parent = (Formattable) parentTag;
+ if (parentTag instanceof IFormattable) {
+ IFormattable parent = (IFormattable) parentTag;
parent.formatterHasError();
}
reportErrors();
return;
}
- if (parentTag instanceof Formattable) {
- Formattable parent = (Formattable) parentTag;
+ if (parentTag instanceof IFormattable) {
+ IFormattable parent = (IFormattable) parentTag;
DateFormatter dateFmt = new DateFormatter();
dateFmt.setPattern(_pattern);
dateFmt.setLocale(getLocale());
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatNumber.java
Sat Jan 15 07:59:49 2005
@@ -149,12 +149,12 @@
public void doTag()
throws JspException
{
- JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
Formattable.class);
+ JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
IFormattable.class);
// if there are errors we need to either add these to the parent
AbstractBastTag or report an error.
if (hasErrors()) {
- if (parentTag instanceof Formattable) {
- Formattable parent = (Formattable) parentTag;
+ if (parentTag instanceof IFormattable) {
+ IFormattable parent = (IFormattable) parentTag;
parent.formatterHasError();
}
reportErrors();
@@ -162,12 +162,12 @@
}
// if there are no errors then add this to the parent as a formatter.
- if (parentTag instanceof Formattable) {
+ if (parentTag instanceof IFormattable) {
NumberFormatter formatter = new NumberFormatter();
formatter.setPattern(_pattern);
formatter.setType(_type);
formatter.setLocale(getLocale());
- Formattable parent = (Formattable) parentTag;
+ IFormattable parent = (IFormattable) parentTag;
parent.addFormatter(formatter);
}
else {
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FormatString.java
Sat Jan 15 07:59:49 2005
@@ -129,23 +129,23 @@
public void doTag()
throws JspException
{
- JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
Formattable.class);
+ JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
IFormattable.class);
// if there are errors we need to either add these to the parent
AbstractBastTag or report an error.
if (hasErrors()) {
- if (parentTag instanceof Formattable) {
- Formattable parent = (Formattable) parentTag;
+ if (parentTag instanceof IFormattable) {
+ IFormattable parent = (IFormattable) parentTag;
parent.formatterHasError();
}
reportErrors();
return;
}
- if (parentTag instanceof Formattable) {
+ if (parentTag instanceof IFormattable) {
StringFormatter formatter = new StringFormatter();
formatter.setPattern(_pattern);
formatter.setTruncate(truncate);
- Formattable parent = (Formattable) parentTag;
+ IFormattable parent = (IFormattable) parentTag;
parent.addFormatter(formatter);
}
else {
Deleted:
/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java?view=auto&rev=125264
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IFormattable.java
(from r125250,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IFormattable.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java&r1=125250&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IFormattable.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Formattable.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IFormattable.java
Sat Jan 15 07:59:49 2005
@@ -20,11 +20,11 @@
/**
* Interface that indicates whether or not a tag's output can be formatted
with by a <code>FormatTag</code>.
*/
-public interface Formattable
+public interface IFormattable
{
/**
* Adds a FormatTag.Formatter instance to the tag's set of formatters.
- * @param formatter - the formatter instance to add to the Formattable
tag's set of formatters.
+ * @param formatter - the formatter instance to add to the IFormattable
tag's set of formatters.
*/
public void addFormatter(FormatTag.Formatter formatter);
Copied:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java
(from r125250,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java&r1=125250&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/IUrlParams.java
Sat Jan 15 07:59:49 2005
@@ -21,7 +21,7 @@
// @todo: should this be rename to IURLParams?
-public interface URLParams
+public interface IUrlParams
{
public void addParameter(String name, Object value) throws JspException;
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java
Sat Jan 15 07:59:49 2005
@@ -46,7 +46,7 @@
* whitespace="indent"
*/
public class Image extends HtmlBaseTag
- implements URLParams
+ implements IUrlParams
{
private ImageTag.State _state = new ImageTag.State();
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -36,7 +36,7 @@
* bodycontentpref="empty"
*/
public class Label extends LabelBase
- implements Formattable
+ implements IFormattable
{
private static final Logger logger = Logger.getInstance(Label.class);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/LabelBase.java
Sat Jan 15 07:59:49 2005
@@ -27,7 +27,7 @@
* This is a base class providing implementation for both the Label and
FormLabel.
*/
public abstract class LabelBase extends HtmlBaseTag
- implements Formattable
+ implements IFormattable
{
protected static final String DEFAULT_NULL_TEXT = "";
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Parameter.java
Sat Jan 15 07:59:49 2005
@@ -29,7 +29,7 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
/**
- * Writes a URL parameter to a URL on its parent tag. The parent tag must
implement URLParams.
+ * Writes a URL parameter to a URL on its parent tag. The parent tag must
implement IUrlParams.
* @jsptagref.tagdescription Writes a name/value pair to the URL or the parent
tag.
*
* You can dynamically determine the value of the <netui:parameter> through
@@ -101,14 +101,14 @@
*/
public int doStartTag() throws JspException
{
- JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
URLParams.class);
+ JspTag parentTag = SimpleTagSupport.findAncestorWithClass(this,
IUrlParams.class);
if (parentTag == null) {
String msg = Bundle.getString("Tags_InvalidParameterParent");
registerTagError(msg, null);
reportErrors();
}
else {
- URLParams parent = (URLParams) parentTag;
+ IUrlParams parent = (IUrlParams) parentTag;
parent.addParameter(_name, _value);
}
localRelease();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ParameterMap.java
Sat Jan 15 07:59:49 2005
@@ -29,7 +29,7 @@
/**
* Writes each in a map of URL parameters to a URL on its parent tag.
- * The parent tag must implement URLParams.
+ * The parent tag must implement IUrlParams.
* @jsptagref.tagdescription <p>Writes a group of name/value pairs to the URL
or the parent tag.
*
* <p>The <netui:parameterMap> can be nested inside of the
@@ -104,12 +104,12 @@
*/
public int doStartTag() throws JspException
{
- Tag parentTag = findAncestorWithClass(this, URLParams.class);
+ Tag parentTag = findAncestorWithClass(this, IUrlParams.class);
if (parentTag != null) {
// this map shouldn't be null because the attribute is required.
// @todo: when Asserts are on, we should assert this instead of
this conditional
if (_map != null) {
- URLParams parent = (URLParams) parentTag;
+ IUrlParams parent = (IUrlParams) parentTag;
Iterator it = _map.entrySet().iterator();
while (it.hasNext()) {
Map.Entry key = (Map.Entry) it.next();
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -161,7 +161,7 @@
* @netui.tldx:attribute name="defaultValue"
*/
public class Select extends HtmlOptionsDataSourceTag
- implements IDataAccessProvider, Formattable
+ implements IDataAccessProvider, IFormattable
{
// @todo: needs to create DRT tests for: verification of errors,
verirication of data sources matching,
// @todo: verification of formating inside a repeater.
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -86,7 +86,7 @@
* bodycontentpref="empty"
*/
public class Span extends LabelBase
- implements Formattable
+ implements IFormattable
{
private static final Logger logger = Logger.getInstance(Span.class);
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java
Sat Jan 15 07:59:49 2005
@@ -44,7 +44,7 @@
* @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.TextAreaRenderer"
bodycontentpref="empty" whitespace="indent"
*/
public class TextArea extends HtmlDefaultableDataSourceTag
- implements Formattable
+ implements IFormattable
{
private TextAreaTag.State _state = new TextAreaTag.State();
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java
Sat Jan 15 07:59:49 2005
@@ -39,7 +39,7 @@
* @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.TextboxRenderer"
bodycontentpref="empty" whitespace="indent"
*/
public class TextBox extends HtmlDefaultableDataSourceTag
- implements Formattable, IHtmlAccessable
+ implements IFormattable, IHtmlAccessable
{
private InputTextTag.State _state = new InputTextTag.State();
Deleted:
/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/URLParams.java?view=auto&rev=125264
==============================================================================
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
Sat Jan 15 07:59:49 2005
@@ -56,6 +56,7 @@
Object o = getParent();
assert (o != null);
if (!(o instanceof TreeItem)) {
+ // @todo: this needs to be logged....
System.err.println("Invalid Parent:" + o.getClass().getName());
return;
}
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -132,6 +132,7 @@
ti.setItemAttribute(_info);
}
else {
+ // This needs to be logged....
System.err.println("Unknown thing here");
}
}
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&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java&r2=125265
==============================================================================
---
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
Sat Jan 15 07:59:49 2005
@@ -56,6 +56,7 @@
Object o = getParent();
assert (o != null);
if (!(o instanceof TreeItem)) {
+ // @todo: this needs to be logged.
System.err.println("Invalid Parent:" + o.getClass().getName());
return;
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java?view=diff&rev=125265&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java&r1=125264&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java&r2=125265
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
Sat Jan 15 07:59:49 2005
@@ -193,6 +193,7 @@
Object o = getParent();
assert (o != null);
if (!(o instanceof TreeItem)) {
+ // @todo: this needs to be logged.
System.err.println("Invalid Parent:" + o.getClass().getName());
return;
}
