You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/04/12 08:43:38 UTC
svn commit: r161025 [9/13] - in incubator/beehive/trunk: ./
external/beehive-antext/ netui/ant/ netui/external/xdoclet/
netui/src/bootstrap/ netui/src/compiler-core/
netui/src/compiler-core/org/apache/beehive/netui/compiler/
netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/
netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/
netui/src/compiler-core/org/apache/beehive/netui/compiler/model/
netui/src/compiler-core/org/apache/beehive/netui/compiler/model/validation/
netui/src/compiler-core/org/apache/beehive/netui/compiler/processor/
netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/declaration/
netui/src/compiler-core/org/apache/beehive/netui/compiler/typesystem/type/
netui/src/compiler-core/schema/processed-annotations/
netui/src/compiler-xdoclet/
netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/tools/
netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/
netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/
netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/env/
netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/type/
netui/src/compiler-xdoclet/org/apache/beehive/netui/tasks/
netui/src/compiler-xdoclet/org/apache/beehive/netui/xdoclet/
netui/src/compiler/ netui/src/compiler/org/apache/beehive/netui/compiler/apt/
netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/
netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/declaration/
netui/src/compiler/org/apache/beehive/netui/compiler/typesystem/impl/type/
netui/src/pageflow-jdk14/ netui/src/pageflow-jdk14/org/
netui/src/pageflow-jdk14/org/apache/
netui/src/pageflow-jdk14/org/apache/beehive/
netui/src/pageflow-jdk14/org/apache/beehive/netui/
netui/src/pageflow-jdk14/org/apache/beehive/netui/pageflow/
netui/src/pageflow-jdk14/org/apache/beehive/netui/pageflow/internal/
netui/src/pageflow/ netui/src/pageflow/org/apache/beehive/netui/pageflow/
netui/src/pageflow/org/apache/beehive/netui/pageflow/config/
netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/
netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/
netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/
netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/
netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/internal/
netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/
netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/
netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/
netui/src/pageflow/org/apache/beehive/netui/pageflow/util/
netui/src/pageflow/org/apache/beehive/netui/pageflow/xmlhttprequest/
netui/src/pageflow/org/apache/beehive/netui/script/common/
netui/src/pageflow/org/apache/beehive/netui/script/el/
netui/src/pageflow/org/apache/beehive/netui/script/el/util/
netui/src/scoping/ netui/src/tags-databinding/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/
netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/
netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/
netui/src/tags-html/ netui/src/tags-html/org/apache/beehive/netui/tags/
netui/src/tags-html/org/apache/beehive/netui/tags/html/
netui/src/tags-html/org/apache/beehive/netui/tags/internal/
netui/src/tags-html/org/apache/beehive/netui/tags/javascript/
netui/src/tags-html/org/apache/beehive/netui/tags/rendering/
netui/src/tags-html/org/apache/beehive/netui/tags/tree/
netui/src/tags-template/
netui/src/tags-template/org/apache/beehive/netui/tags/template/
netui/src/testRecorder/
netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/ netui/src/util/
netui/src/util/org/apache/beehive/netui/core/urls/
netui/src/util/org/apache/beehive/netui/core/urltemplates/
netui/src/util/org/apache/beehive/netui/util/
netui/src/util/org/apache/beehive/netui/util/cache/
netui/src/util/org/apache/beehive/netui/util/classloader/
netui/src/util/org/apache/beehive/netui/util/config/
netui/src/util/org/apache/beehive/netui/util/internal/
netui/src/util/org/apache/beehive/netui/util/internal/concurrent/
netui/src/util/org/apache/beehive/netui/util/type/ netui/test/src/junitTests/
netui/test/src/junitTests/org/apache/beehive/netui/test/core/urls/
netui/test/src/junitTests/org/apache/beehive/netui/test/core/urltemplates/
netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/
netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/
netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/
netui/test/src/testRecorderQA/ netui/test/webapps/drt/
netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/
netui/test/webapps/drt/coreWeb/miniTests/actionInterceptors/interruptChain/
netui/test/webapps/drt/coreWeb/miniTests/exceptionMessages/
netui/test/webapps/drt/coreWeb/miniTests/handlePageException/
netui/test/webapps/drt/coreWeb/miniTests/handlers/
netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/
netui/test/webapps/drt/coreWeb/miniTests/preventDoubleSubmit/
netui/test/webapps/drt/coreWeb/miniTests/tiles/
netui/test/webapps/drt/coreWeb/miniTests/updateFormFromNested/
netui/test/webapps/drt/coreWeb/pageFlowCore/inheritance/super1/
netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/
netui/test/webapps/drt/coreWeb/tags/encoding/
netui/test/webapps/drt/coreWeb/template/xhtml/
netui/test/webapps/drt/coreWeb/tiles/pf/
netui/test/webapps/drt/coreWeb/tiles/pf/nested/
netui/test/webapps/drt/coreWeb/validation/addExpressionMessages/
netui/test/webapps/drt/coreWeb/validation/argExpressions/
netui/test/webapps/drt/coreWeb/validation/custom/
netui/test/webapps/drt/coreWeb/validation/declarativeValidation/
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -182,15 +182,22 @@
/**
* This enum defines stages through the possible option values.
*/
- public enum RepeatingStages
+ public static class RepeatingStages
{
- BEFORE (0),
- OPTION (1),
- DEFAULT (2),
- DATASOURCE (3),
- NULL (4),
- DONE (5);
-
+ private static final int INT_BEFORE = 0;
+ private static final int INT_OPTION = 1;
+ private static final int INT_DEFAULT = 2;
+ private static final int INT_DATASOURCE = 3;
+ private static final int INT_NULL = 4;
+ private static final int INT_DONE = 5;
+
+ static final RepeatingStages BEFORE = new RepeatingStages(INT_BEFORE);
+ static final RepeatingStages OPTION = new RepeatingStages(INT_OPTION);
+ static final RepeatingStages DEFAULT = new RepeatingStages(INT_DEFAULT);
+ static final RepeatingStages DATASOURCE = new RepeatingStages(INT_DATASOURCE);
+ static final RepeatingStages NULL = new RepeatingStages(INT_NULL);
+ static final RepeatingStages DONE = new RepeatingStages(INT_DONE);
+
/**
* These are the publically exposed stages, <code>REPEATING_OPTION, REPEATING_DEFAULT,
* REPEATING_DATASOURCE and REPEATING_NULL</code>.
@@ -207,6 +214,11 @@
{
value = val;
}
+
+ int getValue()
+ {
+ return value;
+ }
/**
* Returns the String value that can be used to order the selection.
@@ -214,14 +226,14 @@
*/
public String toString()
{
- switch (this) {
- case OPTION:
+ switch (value) {
+ case INT_OPTION:
return REPEATING_OPTION;
- case DEFAULT:
+ case INT_DEFAULT:
return REPEATING_DEFAULT;
- case DATASOURCE:
+ case INT_DATASOURCE:
return REPEATING_DATASOURCE;
- case NULL:
+ case INT_NULL:
return REPEATING_NULL;
default:
return "Unknown Stage";
@@ -911,8 +923,8 @@
{
final String END_TOKEN = "</span>";
assert(_saveBody != null);
- StringBuilder body = new StringBuilder(_saveBody.length());
- StringBuilder error = new StringBuilder(_saveBody.length());
+ StringBuffer body = new StringBuffer(_saveBody.length());
+ StringBuffer error = new StringBuffer(_saveBody.length());
// pull out all of the spans These should be legally constructed, otherwise we will ignore them.
int len = _saveBody.length();
@@ -955,11 +967,11 @@
private boolean doRepeaterAfterBody()
throws JspException
{
- switch (_repCurStage) {
- case BEFORE:
+ switch (_repCurStage.getValue()) {
+ case RepeatingStages.INT_BEFORE:
moveNext();
return doRepeaterAfterBody();
- case OPTION:
+ case RepeatingStages.INT_OPTION:
assert (_repeaterIterator instanceof Iterator);
while (_repeaterIterator.hasNext()) {
_repCurItem = _repeaterIterator.next();
@@ -972,9 +984,9 @@
return false;
return doRepeaterAfterBody();
- case DEFAULT:
- case DATASOURCE:
- case NULL:
+ case RepeatingStages.INT_DEFAULT:
+ case RepeatingStages.INT_DATASOURCE:
+ case RepeatingStages.INT_NULL:
assert (_repeaterIterator instanceof Iterator);
while (_repeaterIterator.hasNext()) {
_repCurItem = _repeaterIterator.next();
@@ -1012,10 +1024,10 @@
// process each type of iteration...
// Each will recursively call moveNext, if that stage doesn't support iteration
- switch (_repCurStage) {
- case BEFORE:
+ switch (_repCurStage.getValue()) {
+ case RepeatingStages.INT_BEFORE:
break;
- case OPTION:
+ case RepeatingStages.INT_OPTION:
// This produces an error if the optionsDataSource is an instance of an iterator
if (!(_dynamicOptions instanceof Iterator)) {
String s = Bundle.getString("Tags_OptionsDSIteratorError");
@@ -1027,15 +1039,15 @@
_repeaterIterator = (Iterator) _dynamicOptions;
break;
- case DEFAULT:
+ case RepeatingStages.INT_DEFAULT:
if (_defaultSelections != null)
_repeaterIterator = _defaultSelections.iterator();
break;
- case DATASOURCE:
+ case RepeatingStages.INT_DATASOURCE:
if (_match != null)
_repeaterIterator = Arrays.asList(_match).iterator();
break;
- case NULL:
+ case RepeatingStages.INT_NULL:
if (_nullable)
_repeaterIterator = new ArrayIterator(NULL_INSTANCE);
break;
@@ -1282,3 +1294,4 @@
_state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, TABINDEX, Integer.toString(tabindex));
}
}
+
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java Mon Apr 11 23:42:11 2005
@@ -261,7 +261,7 @@
// Generate an HTML <option> element
- //StringBuilder results = new StringBuilder(128);
+ //StringBuffer results = new StringBuffer(128);
_state.value = _value;
// we assume that tagId will over have override id if both
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&r1=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -262,7 +262,7 @@
String text = null;
if (textObject != null) {
text = formatText(textObject);
- StringBuilder sb = new StringBuilder(text.length() + 16);
+ StringBuffer sb = new StringBuffer(text.length() + 16);
StringBuilderRenderAppender sbAppend = new StringBuilderRenderAppender(sb);
HtmlUtils.filter(text, sbAppend);
text = sb.toString();
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.tags.internal;
-import org.apache.beehive.netui.core.urls.URLRewriter.URLType;
+import org.apache.beehive.netui.core.urls.URLType;
import org.apache.beehive.netui.pageflow.FlowController;
import org.apache.beehive.netui.pageflow.PageFlowConstants;
import org.apache.beehive.netui.pageflow.PageFlowUtils;
@@ -216,7 +216,7 @@
sharedFlowName = sharedFlowName.substring(1);
}
- FlowController sharedFlow = PageFlowUtils.getSharedFlows(request).get(sharedFlowName);
+ FlowController sharedFlow = (FlowController) PageFlowUtils.getSharedFlows(request).get(sharedFlowName);
if (sharedFlow != null) {
String actionPath = '/' + action.substring(dot + 1);
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java Mon Apr 11 23:42:11 2005
@@ -107,8 +107,8 @@
HttpServletRequest httpRequest = (HttpServletRequest) request;
if (_retrieveMap != null) {
- for (Iterator<Map.Entry> i = _retrieveMap.entrySet().iterator(); i.hasNext();) {
- Map.Entry entry = i.next();
+ for (Iterator/*<Map.Entry>*/ i = _retrieveMap.entrySet().iterator(); i.hasNext();) {
+ Map.Entry entry = (Map.Entry) i.next();
String fieldID = (String) entry.getKey();
String expressionToRetrieve = "${" + (String) entry.getValue() + '}';
try {
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/CoreScriptFeature.java Mon Apr 11 23:42:11 2005
@@ -20,32 +20,95 @@
/**
*
*/
-public enum CoreScriptFeature
+public class CoreScriptFeature
{
- LEGACY_LOOKUP (0x0001),
- ID_LOOKUP (0x0002),
- NAME_LOOKUP (0x0004),
- SCOPE_LOOKUP (0x0008),
- ROLLOVER (0x0010),
- ANCHOR_SUBMIT (0x0020),
- POPUP_DONE (0x0040),
- ALLOCATE_LEGACY (0x0080),
- ALLOCATE_ID (0x0100),
- ALLOCATE_NAME (0x0200),
- LEGACY_SCOPE_LOOKUP (0x0400),
- TREE_INIT (0x0800),
- DIVPANEL_INIT (0x1000),
- DYNAMIC_INIT (0x2000),
- BUTTON_DISABLE_AND_SUBMIT (0x4000),
- BUTTON_DISABLE (0x8000),
+ public static final int INT_LEGACY_LOOKUP = 0x0001;
+ public static final int INT_ID_LOOKUP = 0x0002;
+ public static final int INT_NAME_LOOKUP = 0x0004;
+ public static final int INT_SCOPE_LOOKUP = 0x0008;
+ public static final int INT_ROLLOVER = 0x0010;
+ public static final int INT_ANCHOR_SUBMIT = 0x0020;
+ public static final int INT_POPUP_DONE = 0x0040;
+ public static final int INT_ALLOCATE_LEGACY = 0x0080;
+ public static final int INT_ALLOCATE_ID = 0x0100;
+ public static final int INT_ALLOCATE_NAME = 0x0200;
+ public static final int INT_LEGACY_SCOPE_LOOKUP = 0x0400;
+ public static final int INT_TREE_INIT = 0x0800;
+ public static final int INT_DIVPANEL_INIT = 0x1000;
+ public static final int INT_DYNAMIC_INIT = 0x2000;
+ public static final int INT_BUTTON_DISABLE_AND_SUBMIT = 0x4000;
+ public static final int INT_BUTTON_DISABLE = 0x8000;
// These features are not written out once. They are identified by setting the top bit
- SET_FOCUS (0x10000001);
+ protected static final int INT_SET_FOCUS = 0x10000001;
public int value;
CoreScriptFeature(int val)
{
value = val;
+ }
+
+ public static final CoreScriptFeature LEGACY_LOOKUP = new CoreScriptFeature(INT_LEGACY_LOOKUP);
+ public static final CoreScriptFeature ID_LOOKUP = new CoreScriptFeature(INT_ID_LOOKUP);
+ public static final CoreScriptFeature NAME_LOOKUP = new CoreScriptFeature(INT_NAME_LOOKUP);
+ public static final CoreScriptFeature SCOPE_LOOKUP = new CoreScriptFeature(INT_SCOPE_LOOKUP);
+ public static final CoreScriptFeature ROLLOVER = new CoreScriptFeature(INT_ROLLOVER);
+ public static final CoreScriptFeature ANCHOR_SUBMIT = new CoreScriptFeature(INT_ANCHOR_SUBMIT);
+ public static final CoreScriptFeature POPUP_DONE = new CoreScriptFeature(INT_POPUP_DONE);
+ public static final CoreScriptFeature ALLOCATE_LEGACY = new CoreScriptFeature(INT_ALLOCATE_LEGACY);
+ public static final CoreScriptFeature ALLOCATE_ID = new CoreScriptFeature(INT_ALLOCATE_ID);
+ public static final CoreScriptFeature ALLOCATE_NAME = new CoreScriptFeature(INT_ALLOCATE_NAME);
+ public static final CoreScriptFeature LEGACY_SCOPE_LOOKUP = new CoreScriptFeature(INT_LEGACY_SCOPE_LOOKUP);
+ public static final CoreScriptFeature TREE_INIT = new CoreScriptFeature(INT_TREE_INIT);
+ public static final CoreScriptFeature DIVPANEL_INIT = new CoreScriptFeature(INT_DIVPANEL_INIT);
+ public static final CoreScriptFeature DYNAMIC_INIT = new CoreScriptFeature(INT_DYNAMIC_INIT);
+ public static final CoreScriptFeature BUTTON_DISABLE_AND_SUBMIT = new CoreScriptFeature(INT_BUTTON_DISABLE_AND_SUBMIT);
+ public static final CoreScriptFeature BUTTON_DISABLE = new CoreScriptFeature(INT_BUTTON_DISABLE);
+ public static final CoreScriptFeature SET_FOCUS = new CoreScriptFeature(INT_SET_FOCUS);
+
+ public String toString()
+ {
+ switch ( value )
+ {
+ case INT_LEGACY_LOOKUP: return "LEGACY_LOOKUP";
+ case INT_ID_LOOKUP: return "ID_LOOKUP";
+ case INT_NAME_LOOKUP: return "NAME_LOOKUP";
+ case INT_SCOPE_LOOKUP: return "SCOPE_LOOKUP";
+ case INT_ROLLOVER: return "ROLLOVER";
+ case INT_ANCHOR_SUBMIT: return "ANCHOR_SUBMIT";
+ case INT_POPUP_DONE: return "POPUP_DONE";
+ case INT_ALLOCATE_LEGACY: return "ALLOCATE_LEGACY";
+ case INT_ALLOCATE_ID: return "ALLOCATE_ID";
+ case INT_ALLOCATE_NAME: return "ALLOCATE_NAME";
+ case INT_LEGACY_SCOPE_LOOKUP: return "LEGACY_SCOPE_LOOKUP";
+ case INT_TREE_INIT: return "TREE_INIT";
+ case INT_DIVPANEL_INIT: return "DIVPANEL_INIT";
+ case INT_DYNAMIC_INIT: return "DYNAMIC_INIT";
+ case INT_BUTTON_DISABLE_AND_SUBMIT: return "BUTTON_DISABLE_AND_SUBMIT";
+ case INT_BUTTON_DISABLE: return "BUTTON_DISABLE";
+ case INT_SET_FOCUS: return "SET_FOCUS";
+ }
+
+ assert false : value;
+ return "<unknown CoreScriptFeature>";
+ }
+
+ public boolean equals( Object o )
+ {
+ if (o == null) return false;
+ if (o == this ) return true;
+ if (!(o instanceof CoreScriptFeature)) return false;
+ return ((CoreScriptFeature)o).value == value;
+ }
+
+ public int hashCode()
+ {
+ return value;
+ }
+
+ public int getIntValue()
+ {
+ return value;
}
}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/IScriptReporter.java Mon Apr 11 23:42:11 2005
@@ -53,7 +53,7 @@
/**
* This method will output all of the Script associated with the script reporter.
- * @param sb The script is written into the provided StringBuilder. This value must not be null.
+ * @param sb The script is written into the provided StringBuffer. This value must not be null.
*/
void writeScript(AbstractRenderAppender sb);
}
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -76,11 +76,11 @@
public final static String SCOPE_ID = "netui:scopeId";
private String _idScope = null;
- private ArrayList<String> _funcBlocks;
- private ArrayList<String> _codeBefore;
- private ArrayList<String> _codeAfter;
- private HashMap<String, String> _idMap;
- private HashMap<String, String> _idToNameMap;
+ private ArrayList/*<String>*/ _funcBlocks;
+ private ArrayList/*<String>*/ _codeBefore;
+ private ArrayList/*<String>*/ _codeAfter;
+ private HashMap/*<String, String>*/ _idMap;
+ private HashMap/*<String, String>*/ _idToNameMap;
private boolean _genScope = false;
private boolean _writeScript = false;
private boolean _writeId = false;
@@ -112,19 +112,19 @@
// get the list of function blocks and add this script to it.
if (placement == null || placement == ScriptPlacement.PLACE_INFRAMEWORK) {
if (_funcBlocks == null) {
- _funcBlocks = new ArrayList<String>();
+ _funcBlocks = new ArrayList/*<String>*/();
}
assert (_funcBlocks != null) : "_funcBlocks should not be null";
_funcBlocks.add(script);
}
else if (placement == ScriptPlacement.PLACE_BEFORE) {
if (_codeBefore == null)
- _codeBefore = new ArrayList<String>();
+ _codeBefore = new ArrayList/*<String>*/();
_codeBefore.add(script);
}
else if (placement == ScriptPlacement.PLACE_AFTER) {
if (_codeAfter == null)
- _codeAfter = new ArrayList<String>();
+ _codeAfter = new ArrayList/*<String>*/();
_codeAfter.add(script);
}
else {
@@ -143,7 +143,7 @@
assert (tagName != null) : "The parameter 'tagName' must not be null";
if (_idMap == null) {
- _idMap = new HashMap<String, String>();
+ _idMap = new HashMap/*<String, String>*/();
}
assert (_idMap != null) : "_idMap should not be null";
@@ -165,14 +165,14 @@
if (realName != null) {
if (_idToNameMap == null)
- _idToNameMap = new HashMap<String, String>();
+ _idToNameMap = new HashMap/*<String, String>*/();
_idToNameMap.put(tagId, realName);
}
}
/**
* This method will output all of the Script associated with the script reporter.
- * @param sb The script is written into the provided StringBuilder. This value must not be null.
+ * @param sb The script is written into the provided StringBuffer. This value must not be null.
*/
public void writeScript(AbstractRenderAppender sb)
{
@@ -282,9 +282,9 @@
{
if (_idScope != null) {
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
- ArrayList<String> list = (ArrayList<String>) RequestUtils.getOuterAttribute(req,SCOPE_ID);
+ ArrayList/*<String>*/ list = (ArrayList/*<String>*/) RequestUtils.getOuterAttribute(req,SCOPE_ID);
if (list == null) {
- list = new ArrayList<String>();
+ list = new ArrayList/*<String>*/();
RequestUtils.setOuterAttribute(req,SCOPE_ID,list);
}
list.add(_idScope);
@@ -296,7 +296,7 @@
{
if (_idScope != null) {
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
- ArrayList<String> list = (ArrayList<String>) RequestUtils.getOuterAttribute(req,SCOPE_ID);
+ ArrayList/*<String>*/ list = (ArrayList/*<String>*/) RequestUtils.getOuterAttribute(req,SCOPE_ID);
assert(list != null);
list.remove(list.size() -1);
}
@@ -336,8 +336,10 @@
if (_codeBefore == null || _codeBefore.size() == 0)
return;
- StringBuilder s = new StringBuilder(256);
- for (String code : _codeBefore) {
+ StringBuffer s = new StringBuffer(256);
+ for (Iterator i = _codeBefore.iterator(); i.hasNext();)
+ {
+ String code = ( String ) i.next();
s.append(code);
s.append("\n");
}
@@ -350,8 +352,10 @@
if (_codeAfter == null || _codeAfter.size() == 0)
return;
- StringBuilder s = new StringBuilder(256);
- for (String code : _codeAfter) {
+ StringBuffer s = new StringBuffer(256);
+ for (Iterator i = _codeAfter.iterator(); i.hasNext();)
+ {
+ String code = ( String ) i.next();
s.append(code);
s.append("\n");
}
@@ -408,7 +412,7 @@
sb.append(s);
int cnt = _funcBlocks.size();
for (int i = 0; i < cnt; i++) {
- sb.append(_funcBlocks.get(i));
+ sb.append((String)_funcBlocks.get(i));
if (i != cnt - 1) {
sb.append("\n");
}
@@ -456,17 +460,17 @@
return idScope;
}
- private String processIdMap(HashMap<String, String> map, String mapEntry, String idScope)
+ private String processIdMap(HashMap/*<String, String>*/ map, String mapEntry, String idScope)
{
// if no map or empty then return
if (map == null || map.size() == 0)
return null;
- StringBuilder results = new StringBuilder(128);
- Iterator<String> ids = map.keySet().iterator();
+ StringBuffer results = new StringBuffer(128);
+ Iterator/*<String>*/ ids = map.keySet().iterator();
while (ids.hasNext()) {
- String id = ids.next();
- String value = map.get(id);
+ String id = (String) ids.next();
+ String value = (String) map.get(id);
if (idScope != null)
id = idScope + "__" + id;
String entry = ScriptRequestState.getString(mapEntry, new Object[]{id, value});
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptPlacement.java Mon Apr 11 23:42:11 2005
@@ -20,10 +20,49 @@
/**
*
*/
-public enum ScriptPlacement
+public class ScriptPlacement
{
- PLACE_BEFORE,
- PLACE_AFTER,
- PLACE_INLINE,
- PLACE_INFRAMEWORK;
+ protected static final int INT_PLACE_BEFORE = 0;
+ protected static final int INT_PLACE_AFTER = 1;
+ protected static final int INT_PLACE_INLINE = 2;
+ protected static final int INT_PLACE_INFRAMEWORK = 3;
+
+ public static final ScriptPlacement PLACE_BEFORE = new ScriptPlacement(INT_PLACE_BEFORE);
+ public static final ScriptPlacement PLACE_AFTER = new ScriptPlacement(INT_PLACE_AFTER);
+ public static final ScriptPlacement PLACE_INLINE = new ScriptPlacement(INT_PLACE_INLINE);
+ public static final ScriptPlacement PLACE_INFRAMEWORK = new ScriptPlacement(INT_PLACE_INFRAMEWORK);
+
+ private int _val;
+
+ private ScriptPlacement(int val)
+ {
+ _val = val;
+ }
+
+ public String toString()
+ {
+ switch (_val)
+ {
+ case INT_PLACE_BEFORE : return "PLACE_BEFORE";
+ case INT_PLACE_AFTER: return "PLACE_AFTER";
+ case INT_PLACE_INLINE: return "PLACE_INLINE";
+ case INT_PLACE_INFRAMEWORK: return "PLACE_INFRAMEWORK";
+ }
+
+ assert false : _val;
+ return "<unknown ScriptPlacement>";
+ }
+
+ public boolean equals( Object o )
+ {
+ if (o == null) return false;
+ if (o == this) return true;
+ if (!(o instanceof ScriptPlacement)) return false;
+ return ((ScriptPlacement )o)._val == _val;
+ }
+
+ public int hashCode()
+ {
+ return _val;
+ }
}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/javascript/ScriptRequestState.java Mon Apr 11 23:42:11 2005
@@ -168,7 +168,7 @@
}
// without a scripRepoter we need to create the actual JavaScript that will be written out
- StringBuilder sb = new StringBuilder(128);
+ StringBuffer sb = new StringBuffer(128);
StringBuilderRenderAppender writer = new StringBuilderRenderAppender(sb);
getTagIdMapping(tagId, realId, realName, writer);
return sb.toString();
@@ -194,7 +194,7 @@
}
// without a scripRepoter we need to create the actual JavaScript that will be written out
- StringBuilder sb = new StringBuilder(64);
+ StringBuffer sb = new StringBuffer(64);
StringBuilderRenderAppender writer = new StringBuilderRenderAppender(sb);
getTagIdMapping(tagId, value, writer);
return sb.toString();
@@ -210,9 +210,9 @@
public String writeNetuiNameFunctions(IScriptReporter scriptReporter, boolean writeLegacy, boolean writeId, boolean writeName)
{
// allocate a String Buffer only if there is no script reporter
- StringBuilder sb = null;
+ StringBuffer sb = null;
if (scriptReporter == null)
- sb = new StringBuilder(256);
+ sb = new StringBuffer(256);
// if we are supporting legacy javascript then output the original javascript method
if (TagConfig.isLegacyJavaScript() && writeLegacy) {
@@ -238,7 +238,7 @@
/**
* This is a static method that will write a consistent look/feel to the
* tags and comment markup that appears around the JavaScript.
- * @param results the StringBuilder that will have the <script>
+ * @param results the StringBuffer that will have the <script>
* tag written into
* @param script the JavaScript block
*/
@@ -275,24 +275,24 @@
*/
private String getFeatureKey(CoreScriptFeature feature)
{
- switch (feature) {
- case ANCHOR_SUBMIT:
+ switch (feature.getIntValue()) {
+ case CoreScriptFeature.INT_ANCHOR_SUBMIT:
return "anchorFormSubmit";
- case SET_FOCUS:
+ case CoreScriptFeature.INT_SET_FOCUS:
return "setFocus";
- case POPUP_DONE:
+ case CoreScriptFeature.INT_POPUP_DONE:
return "popupDone";
- case ROLLOVER:
+ case CoreScriptFeature.INT_ROLLOVER:
return "rollover";
- case TREE_INIT:
+ case CoreScriptFeature.INT_TREE_INIT:
return "initTree";
- case DIVPANEL_INIT:
+ case CoreScriptFeature.INT_DIVPANEL_INIT:
return "initDivPanel";
- case DYNAMIC_INIT:
+ case CoreScriptFeature.INT_DYNAMIC_INIT:
return "writeWebAppName";
- case BUTTON_DISABLE_AND_SUBMIT:
+ case CoreScriptFeature.INT_BUTTON_DISABLE_AND_SUBMIT:
return "buttonDisableAndSubmitForm";
- case BUTTON_DISABLE:
+ case CoreScriptFeature.INT_BUTTON_DISABLE:
return "buttonDisable";
}
assert(false) : "getFeature fell through on feature:" + feature;
@@ -343,7 +343,7 @@
*/
private void getTagIdMapping(String tagId, String realId, String realName, AbstractRenderAppender results)
{
- StringBuilder sb = new StringBuilder(128);
+ StringBuffer sb = new StringBuffer(128);
if (realId != null) {
if ((_javaScriptFeatures & CoreScriptFeature.ALLOCATE_ID.value) == 0) {
_javaScriptFeatures |= CoreScriptFeature.ALLOCATE_ID.value;
@@ -370,7 +370,7 @@
writeScriptBlock(_req, results, sb.toString());
}
- private void writeLookupMethod(IScriptReporter scriptReporter, StringBuilder sb, String bundleString, int feature)
+ private void writeLookupMethod(IScriptReporter scriptReporter, StringBuffer sb, String bundleString, int feature)
{
if ((_javaScriptFeatures & feature) != 0)
return;
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -19,23 +19,23 @@
/**
* This is an implementation of {@link AbstractRenderAppender} which appends
- * Strings to a {@link java.lang.StringBuilder}
+ * Strings to a {@link java.lang.StringBuffer}
*/
public class StringBuilderRenderAppender
extends AbstractRenderAppender
{
- private StringBuilder _sb;
+ private StringBuffer _sb;
public StringBuilderRenderAppender()
{
}
- public StringBuilderRenderAppender(StringBuilder sb)
+ public StringBuilderRenderAppender(StringBuffer sb)
{
_sb = sb;
}
- public void setStringBuilder(StringBuilder sb)
+ public void setStringBuffer(StringBuffer sb)
{
_sb = sb;
}
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -72,4 +72,4 @@
renderEndTag(sb, TBODY);
}
}
-}
\ No newline at end of file
+}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TFootTag.java Mon Apr 11 23:42:11 2005
@@ -73,4 +73,4 @@
renderEndTag(sb, TFOOT);
}
}
-}
\ No newline at end of file
+}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/THeadTag.java Mon Apr 11 23:42:11 2005
@@ -70,4 +70,4 @@
renderEndTag(sb, THEAD);
}
}
-}
\ No newline at end of file
+}
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java Mon Apr 11 23:42:11 2005
@@ -130,15 +130,15 @@
/**
* Render the start tag for an element. The element will render the tag and all of it's
- * attributes into a StringBuilder.
- * @param sb A StringBuilder where the element start tag is appended.
+ * attributes into a StringBuffer.
+ * @param sb A StringBuffer where the element start tag is appended.
* @param renderState The state assocated with the element.
*/
abstract public void doStartTag(AbstractRenderAppender sb, AbstractTagState renderState);
/**
* Render the end tag for an element. The end tag will be rendered if the tag requires an end tag.
- * @param sb A StringBuilder where the element end tag may be appended.
+ * @param sb A StringBuffer where the element end tag may be appended.
*/
abstract public void doEndTag(AbstractRenderAppender sb);
@@ -167,11 +167,11 @@
}
/**
- * This method will append an attribute value to a StringBuilder.
+ * This method will append an attribute value to a StringBuffer.
* The method assumes that the attr is not <code>null</code>. If the
* <code>value</code> attribute is <code>null</code> the attribute will not be appended to the
- * <code>StringBuilder</code>.
- * @param buf The StringBuilder to append the attribute into.
+ * <code>StringBuffer</code>.
+ * @param buf The StringBuffer to append the attribute into.
* @param name The name of the attribute
* @param value The value of teh attribute. If this is <code>null</code> the attribute will not be written.
*/
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -30,11 +30,11 @@
{
private static final Logger logger = Logger.getInstance(ServletTreeRenderer.class);
AbstractRenderAppender _writer;
- StringBuilder _sb;
+ StringBuffer _sb;
ServletTreeRenderer(TreeRenderState trs, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext,
- AbstractRenderAppender writer, StringBuilder sb)
+ AbstractRenderAppender writer, StringBuffer sb)
{
super(trs, request, response, servletContext);
_writer = writer;
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -116,7 +116,7 @@
private String _treeStyle; // tree style
private String _treeStyleClass; // tree class
- private StringBuilder _errorText; // Text of any error that may have occurred.
+ private StringBuffer _errorText; // Text of any error that may have occurred.
private String _dataSource = null; // The name of the tree.
private boolean _renderTagIdLookup = false; // cause the base javascript support to be output
@@ -680,7 +680,7 @@
}
// If we don't have a root element, then we need to create it by processing the body which contains
- // <TreeItems> tags that define the tree.
+ // /*<TreeItems>*/ tags that define the tree.
if (root == null) {
getBufferBody(false);
@@ -768,7 +768,7 @@
// prepare to render the tree
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
HttpServletResponse response = (HttpServletResponse) pageContext.getResponse();
- StringBuilder sb = new StringBuilder(1024);
+ StringBuffer sb = new StringBuffer(1024);
StringBuilderRenderAppender writer = new StringBuilderRenderAppender(sb);
// this is the treeId from the request. If there was an tree expansion this will be
@@ -915,7 +915,7 @@
int index = template.indexOf(placeholder);
if (index < 0)
break;
- StringBuilder temp = new StringBuilder(template.substring(0, index));
+ StringBuffer temp = new StringBuffer(template.substring(0, index));
temp.append(value);
temp.append(template.substring(index + placeholder.length()));
template = temp.toString();
@@ -947,7 +947,7 @@
public void collectChildError(String error)
{
if (_errorText == null) {
- _errorText = new StringBuilder(32);
+ _errorText = new StringBuffer(32);
}
_errorText.append(error);
}
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -113,7 +113,7 @@
elem.setExpanded(expand);
if (expandSvr != null) {
- StringBuilder sb = new StringBuilder(1024);
+ StringBuffer sb = new StringBuffer(1024);
StringBuilderRenderAppender writer = new StringBuilderRenderAppender(sb);
// Start the document
writeStartElement(writer, TREE_EXPAND_ELEM);
@@ -126,7 +126,7 @@
TreeElement children[] = elem.getChildren();
AttributeRenderer extraAttrs = new AttributeRenderer();
int newLevel = elem.getLevel() + 1;
- StringBuilder treeRendering = new StringBuilder();
+ StringBuffer treeRendering = new StringBuffer();
TreeElement tmp = elem;
InheritableState iState = null;
while (iState == null && tmp != null) {
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=161024&r2=161025
==============================================================================
--- 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 Mon Apr 11 23:42:11 2005
@@ -90,7 +90,7 @@
* @param state
* @throws javax.servlet.jsp.JspException
*/
- protected void render(StringBuilder sb, TreeElement node, int level, AttributeRenderer attrs,
+ protected void render(StringBuffer sb, TreeElement node, int level, AttributeRenderer attrs,
InheritableState state)
throws JspException
{
@@ -123,7 +123,7 @@
AttributeRenderer.RemoveInfo removes = attrs.addElement(node);
// get the renderers for this tree...
- StringBuilder img = new StringBuilder(32);
+ StringBuffer img = new StringBuffer(32);
// Render the beginning of this node
@@ -151,7 +151,7 @@
boolean devMode = !AdapterManager.getServletContainerAdapter(servletContext).isInProductionMode();
if (devMode) {
boolean error = false;
- StringBuilder errorText = new StringBuilder(64);
+ StringBuffer errorText = new StringBuffer(64);
if (node.getName() == null) {
errorText.append("name");
error = true;
@@ -439,7 +439,7 @@
// Render the label for this node (if any)
if (label != null) {
if (_trs.escapeContent) {
- StringBuilder s = new StringBuilder(label.length() + 16);
+ StringBuffer s = new StringBuffer(label.length() + 16);
StringBuilderRenderAppender sbAppend = new StringBuilderRenderAppender(sb);
HtmlUtils.filter(label, sbAppend);
label = s.toString();
@@ -453,7 +453,7 @@
String ctnt = node.getContent();
if (ctnt != null) {
if (_trs.escapeContent) {
- StringBuilder s = new StringBuilder(ctnt.length() + 16);
+ StringBuffer s = new StringBuffer(ctnt.length() + 16);
StringBuilderRenderAppender sbAppend = new StringBuilderRenderAppender(sb);
HtmlUtils.filter(ctnt, sbAppend);
ctnt = s.toString();
@@ -484,7 +484,7 @@
attrs.removeElement(node, removes);
}
- private boolean renderExpansionAnchor(StringBuilder sb, TagRenderingBase anchorRenderer,
+ private boolean renderExpansionAnchor(StringBuffer sb, TagRenderingBase anchorRenderer,
TreeElement node, String nodeName, InheritableState state)
throws JspException
{
@@ -534,7 +534,7 @@
* @param encodedNodeName
* @return
*/
- private boolean renderClientExpansionAnchor(StringBuilder sb, TagRenderingBase anchorRenderer,
+ private boolean renderClientExpansionAnchor(StringBuffer sb, TagRenderingBase anchorRenderer,
TreeElement node, String encodedNodeName,
InheritableState state)
{
Modified: incubator/beehive/trunk/netui/src/tags-template/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/build.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-template/build.xml Mon Apr 11 23:42:11 2005
@@ -31,7 +31,8 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source}">
+ source="${compile.source}"
+ target="${compile.target}">
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java (original)
+++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java Mon Apr 11 23:42:11 2005
@@ -331,7 +331,7 @@
int pos = in.indexOf(boldStart);
if (pos == -1)
return in;
- StringBuilder sb = new StringBuilder(in.substring(0,pos));
+ StringBuffer sb = new StringBuffer(in.substring(0,pos));
int fill = pos+boldStart.length();
pos = in.indexOf(boldEnd,fill);
if (pos == -1)
Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java (original)
+++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java Mon Apr 11 23:42:11 2005
@@ -211,7 +211,7 @@
}
}
if (parentTag instanceof DivPanel) {
- StringBuilder results = new StringBuilder(128);
+ StringBuffer results = new StringBuffer(128);
results.append("<div ");
renderTagId(results);
if (hasErrors()) {
@@ -328,7 +328,7 @@
* @param buffer
* @return String
*/
- private final String renderTagId(StringBuilder buffer)
+ private final String renderTagId(StringBuffer buffer)
throws JspException {
assert(_name != null);
@@ -342,12 +342,12 @@
}
/**
- * This method will write append an attribute value to a StringBuilder.
+ * This method will write append an attribute value to a StringBuffer.
* The method assumes that the attr is not <code>null</code>. If the
* value is <code>null</code> the attribute will not be appended to the
- * <code>StringBuilder</code>.
+ * <code>StringBuffer</code>.
*/
- private void renderAttribute(StringBuilder buf, String name, String value)
+ private void renderAttribute(StringBuffer buf, String name, String value)
{
assert (name != null);
if (value == null)
Modified: incubator/beehive/trunk/netui/src/testRecorder/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/testRecorder/build.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/testRecorder/build.xml (original)
+++ incubator/beehive/trunk/netui/src/testRecorder/build.xml Mon Apr 11 23:42:11 2005
@@ -37,6 +37,7 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}">
<include name="**/*.java"/>
</javac>
Modified: incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java (original)
+++ incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java Mon Apr 11 23:42:11 2005
@@ -99,43 +99,43 @@
* a transport-guarantee of <code>NONE</code> is associated with the given resource; or
* <code>null</code> if there is no transport-guarantee associated with the given resource.
*/
- @Override
+
public SecurityProtocol getSecurityProtocol( String uri, HttpServletRequest request )
{
uri = ScopedServletUtils.normalizeURI( uri );
Boolean isSecure= getHelper( request ).isSecureResource( uri, request );
return isSecure != null
- ? ( isSecure ? SecurityProtocol.SECURE : SecurityProtocol.UNSECURE )
+ ? ( isSecure.booleanValue() ? SecurityProtocol.SECURE : SecurityProtocol.UNSECURE )
: SecurityProtocol.UNSPECIFIED;
}
- @Override
+
public boolean doSecurityRedirect( String uri, HttpServletRequest request, HttpServletResponse response )
{
return getHelper( request ).doSecurityRedirect( uri, request, response, getServletContext() );
}
- @Override
+
public int getListenPort( HttpServletRequest request )
{
return getHelper( request ).getListenPort( request );
}
- @Override
+
public int getSecureListenPort( HttpServletRequest request )
{
return getHelper( request ).getSecureListenPort( request );
}
- @Override
+
public void login( String username, String password, HttpServletRequest request, HttpServletResponse response )
throws LoginException
{
getHelper( request ).login( username, password, request );
}
- @Override
+
public void logout( boolean invalidateSessions, HttpServletRequest request, HttpServletResponse response )
{
getHelper( request ).logout( invalidateSessions, request );
Modified: incubator/beehive/trunk/netui/src/util/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/build.xml?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/build.xml (original)
+++ incubator/beehive/trunk/netui/src/util/build.xml Mon Apr 11 23:42:11 2005
@@ -36,7 +36,8 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source}">
+ source="${compile.source}"
+ target="${compile.target}">
<include name="**/*.java"/>
</javac>
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/FreezableMutableURI.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/FreezableMutableURI.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/FreezableMutableURI.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/FreezableMutableURI.java Mon Apr 11 23:42:11 2005
@@ -131,7 +131,7 @@
* @param encoded Flag indicating whether the string is
* already encoded.
*/
- @Override
+
public void setURI( String uriString, boolean encoded ) throws URISyntaxException
{
testFrozen();
@@ -143,7 +143,7 @@
*
* @param encoding
*/
- @Override
+
public void setEncoding( String encoding )
{
testFrozen();
@@ -155,7 +155,7 @@
*
* @param scheme protocol/scheme
*/
- @Override
+
public void setScheme( String scheme )
{
testFrozen();
@@ -167,7 +167,7 @@
*
* @param userInfo userInfo
*/
- @Override
+
public void setUserInfo( String userInfo )
{
testFrozen();
@@ -179,7 +179,7 @@
*
* @param host host
*/
- @Override
+
public void setHost( String host )
{
testFrozen();
@@ -191,7 +191,7 @@
*
* @param port port
*/
- @Override
+
public void setPort( int port )
{
testFrozen();
@@ -203,7 +203,7 @@
*
* @param path path
*/
- @Override
+
public void setPath( String path )
{
testFrozen();
@@ -217,7 +217,7 @@
*
* @param query Query string
*/
- @Override
+
public void setQuery( String query )
{
testFrozen();
@@ -240,7 +240,7 @@
* @param encoded Flag indicating whether the names and values are
* already encoded.
*/
- @Override
+
public void addParameter( String name, String value, boolean encoded )
{
testFrozen();
@@ -260,7 +260,7 @@
* @param encoded Flag indicating whether the names and values are
* already encoded.
*/
- @Override
+
public void addParameters( Map newParams, boolean encoded )
{
testFrozen();
@@ -272,7 +272,7 @@
*
* @param name name
*/
- @Override
+
public void removeParameter( String name )
{
testFrozen();
@@ -284,7 +284,7 @@
*
* @param fragment fragment
*/
- @Override
+
public void setFragment( String fragment )
{
testFrozen();
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/MutableURI.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/MutableURI.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/MutableURI.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/MutableURI.java Mon Apr 11 23:42:11 2005
@@ -88,7 +88,7 @@
private String _path;
/** Query parameters */
- private LinkedHashMap< String, List< String > > _params;
+ private LinkedHashMap/*< String, List< String > >*/ _params;
/** Fragment */
private String _fragment;
@@ -98,9 +98,8 @@
private static final String PARAM_DELIMITER = "&";
private static final String PARAM_DELIMITER_FOR_XML = "&";
- private static final List< String > EMPTY_LIST = Collections.unmodifiableList( new ArrayList< String >( 0 ) );
- private static final Map< String, List< String > > EMPTY_MAP =
- Collections.unmodifiableMap( new HashMap< String, List< String > >() );
+ private static final Map/*< String, List< String > >*/ EMPTY_MAP =
+ Collections.unmodifiableMap( new HashMap/*< String, List< String > >*/() );
/**
* Constructs a <code>MutableURI</code>.
@@ -554,10 +553,14 @@
StringBuffer query = new StringBuffer( 64 );
boolean firstParam = true;
- for ( String name : _params.keySet() )
+ for ( Iterator i = _params.keySet().iterator(); i.hasNext(); )
{
- for ( String value : _params.get( name ) )
+ String name = ( String ) i.next();
+
+ for ( Iterator j = ( ( List ) _params.get( name ) ).iterator(); j.hasNext(); )
{
+ String value = ( String ) j.next();
+
if ( firstParam )
{
firstParam = false;
@@ -594,10 +597,7 @@
*/
public void addParameter( String name, String value, boolean encoded )
{
- if ( name == null )
- {
- throw new IllegalArgumentException( "A parameter name may not be null." );
- }
+ if ( name == null ) throw new IllegalArgumentException( "A parameter name may not be null." );
if ( !encoded )
{
@@ -605,15 +605,12 @@
value = encode( value );
}
- if ( _params == null )
- {
- _params = new LinkedHashMap< String, List< String > >();
- }
-
- List< String > values = _params.get( name );
+ if ( _params == null ) _params = new LinkedHashMap/*< String, List< String > >*/();
+ List/*< String >*/ values = ( List ) _params.get( name );
+
if ( values == null )
{
- values = new ArrayList< String >();
+ values = new ArrayList/*< String >*/();
_params.put( name, values );
}
@@ -647,7 +644,7 @@
if ( _params == null )
{
- _params = new LinkedHashMap< String, List< String > >();
+ _params = new LinkedHashMap/*< String, List< String > >*/();
}
Iterator keys = newParams.keySet().iterator();
@@ -658,10 +655,10 @@
if ( !encoded ) { encodedName = encode( name ); }
- List< String > values = _params.get( encodedName );
+ List/*< String >*/ values = ( List ) _params.get( encodedName );
if ( values == null )
{
- values = new ArrayList< String >();
+ values = new ArrayList/*< String >*/();
_params.put( encodedName, values );
}
@@ -697,7 +694,7 @@
}
}
- private void addValue( List< String > list, String value, boolean encoded )
+ private void addValue( List/*< String >*/ list, String value, boolean encoded )
{
if ( !encoded )
{
@@ -719,10 +716,10 @@
{
if ( _params == null ) { return null; }
- List< String > values = _params.get( name );
+ List/*< String >*/ values = ( List ) _params.get( name );
if ( values != null && values.size() > 0 )
{
- return values.get( 0 );
+ return ( String ) values.get( 0 );
}
else
{
@@ -736,19 +733,19 @@
* @param name name of the parameter
* @return an unmodifable {@link java.util.List} of values for the given parameter name
*/
- public List< String > getParameters( String name )
+ public List/*< String >*/ getParameters( String name )
{
if ( _params == null )
{
- return EMPTY_LIST;
+ return Collections.EMPTY_LIST;
}
else
{
- List< String > values = _params.get( name );
+ List/*< String >*/ values = ( List ) _params.get( name );
if ( values == null )
{
- return EMPTY_LIST;
+ return Collections.EMPTY_LIST;
}
else
{
@@ -762,7 +759,7 @@
*
* @return an unmodifiable {@link java.util.Map} of names and values for all parameters
*/
- public Map< String, List< String > > getParameters()
+ public Map/*< String, List< String > >*/ getParameters()
{
if ( _params == null )
{
@@ -845,7 +842,7 @@
private String getURIString(String paramSeparator)
{
- StringBuilder buf = new StringBuilder( 128 );
+ StringBuffer buf = new StringBuffer( 128 );
// Append the scheme
if ( getScheme() != null )
@@ -904,7 +901,7 @@
return url;
}
- private static void appendEnsureSeparator( StringBuilder buf, String token )
+ private static void appendEnsureSeparator( StringBuffer buf, String token )
{
if ( token != null && token.length() > 0 )
{
@@ -968,7 +965,7 @@
* @return true if object is a MutableURI with all values equal to this
* MutableURI, false otherwise
*/
- @Override
+
public boolean equals( Object object )
{
if ( object == this ) { return true; }
@@ -988,8 +985,8 @@
( _fragment == testURI.getFragment() || ( _fragment != null && _fragment.equals( testURI.getFragment() ) ) ) &&
( _encoding == testURI.getEncoding() || ( _encoding != null && _encoding.equals( testURI.getEncoding() ) ) ) )
{
- Map< String, List< String > > params = getParameters();
- Map< String, List< String > > testParams = testURI.getParameters();
+ Map/*< String, List< String > >*/ params = getParameters();
+ Map/*< String, List< String > >*/ testParams = testURI.getParameters();
if ( params == testParams || ( params != null && params.equals( testParams ) ) ) {
return true;
@@ -1015,7 +1012,7 @@
*
* @return a hash code value for this object.
*/
- @Override
+
public int hashCode()
{
return 0;
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriter.java Mon Apr 11 23:42:11 2005
@@ -28,12 +28,6 @@
public abstract class URLRewriter
{
/**
- * Passed to {@link URLRewriter#rewriteURL} for normal (non-resource) and resource, non-secure and
- * secure URLs.
- */
- public enum URLType { ACTION, RESOURCE }
-
- /**
* Flag indicating that other rewriters are allowed to be used in the chain.
* The URLRewriterService API will not allow more than one URLRewriter in
* the chain with this property equal to false.
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLRewriterService.java Mon Apr 11 23:42:11 2005
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.core.urls;
-import org.apache.beehive.netui.core.urls.URLRewriter.URLType;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.util.logging.Logger;
@@ -25,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Iterator;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -67,14 +67,15 @@
*/
public static String getNamePrefix( ServletContext servletContext, ServletRequest request, String name )
{
- ArrayList< URLRewriter > rewriters = getRewriters( request );
+ ArrayList/*< URLRewriter >*/ rewriters = getRewriters( request );
- StringBuilder prefix = new StringBuilder();
+ StringBuffer prefix = new StringBuffer();
if ( rewriters != null )
{
- for ( URLRewriter rewriter : rewriters )
+ for ( Iterator i = rewriters.iterator(); i.hasNext(); )
{
+ URLRewriter rewriter = ( URLRewriter ) i.next();
String nextPrefix = rewriter.getNamePrefix( servletContext, request, name );
if ( nextPrefix != null ) { prefix.append( nextPrefix ); }
}
@@ -111,12 +112,13 @@
ServletResponse response, MutableURI url, URLType type,
boolean needsToBeSecure )
{
- ArrayList< URLRewriter > rewriters = getRewriters( request );
+ ArrayList/*< URLRewriter >*/ rewriters = getRewriters( request );
if ( rewriters != null )
{
- for ( URLRewriter rewriter : rewriters )
+ for ( Iterator i = rewriters.iterator(); i.hasNext(); )
{
+ URLRewriter rewriter = ( URLRewriter ) i.next();
rewriter.rewriteURL( servletContext, request, response, url, type, needsToBeSecure );
}
}
@@ -134,7 +136,7 @@
* @param request the current ServletRequest.
* @return an unmodifiable list of the URLRewriters that have been registered.
*/
- public static List< URLRewriter > getURLRewriters( ServletRequest request )
+ public static List/*< URLRewriter >*/ getURLRewriters( ServletRequest request )
{
return Collections.unmodifiableList( getRewriters( request ) );
}
@@ -152,11 +154,11 @@
*/
public static boolean registerURLRewriter( ServletRequest request, URLRewriter rewriter )
{
- ArrayList< URLRewriter > rewriters = getRewriters( request );
+ ArrayList/*< URLRewriter >*/ rewriters = getRewriters( request );
if ( rewriters == null )
{
- rewriters = new ArrayList< URLRewriter >();
+ rewriters = new ArrayList/*< URLRewriter >*/();
rewriters.add( rewriter );
request.setAttribute( URL_REWRITERS_KEY, rewriters );
}
@@ -183,11 +185,11 @@
*/
public static boolean registerURLRewriter( int index, ServletRequest request, URLRewriter rewriter )
{
- ArrayList< URLRewriter > rewriters = getRewriters( request );
+ ArrayList/*< URLRewriter >*/ rewriters = getRewriters( request );
if ( rewriters == null )
{
- rewriters = new ArrayList< URLRewriter >();
+ rewriters = new ArrayList/*< URLRewriter >*/();
rewriters.add( rewriter );
request.setAttribute( URL_REWRITERS_KEY, rewriters );
}
@@ -199,12 +201,12 @@
return true;
}
- private static ArrayList< URLRewriter > getRewriters( ServletRequest request )
+ private static ArrayList/*< URLRewriter >*/ getRewriters( ServletRequest request )
{
- return ( ArrayList< URLRewriter > ) ScopedServletUtils.getScopedRequestAttribute( URL_REWRITERS_KEY, request );
+ return ( ArrayList/*< URLRewriter >*/ ) ScopedServletUtils.getScopedRequestAttribute( URL_REWRITERS_KEY, request );
}
- private static boolean addRewriter( ArrayList< URLRewriter > rewriters, URLRewriter rewriter, int index )
+ private static boolean addRewriter( ArrayList/*< URLRewriter >*/ rewriters, URLRewriter rewriter, int index )
{
if ( otherRewritersAllowed( rewriters ) )
{
@@ -216,7 +218,7 @@
if ( rewriters.size() > 0 && _log.isInfoEnabled() )
{
- StringBuilder message = new StringBuilder();
+ StringBuffer message = new StringBuffer();
message.append( "Register exclusive URLRewriter, \"");
message.append( rewriter.getClass().getName() );
message.append( "\". This removes any other URLRewriter objects already registered in the chain." );
@@ -230,7 +232,7 @@
{
if ( _log.isInfoEnabled() )
{
- StringBuilder message = new StringBuilder();
+ StringBuffer message = new StringBuffer();
message.append( "Cannot register URLRewriter, \"");
message.append( rewriter.getClass().getName() );
message.append( "\". The URLRewriter, \"" );
@@ -245,9 +247,10 @@
return true;
}
- private static boolean otherRewritersAllowed( ArrayList< URLRewriter > rewriters )
+ private static boolean otherRewritersAllowed( ArrayList/*< URLRewriter >*/ rewriters )
{
- if ( rewriters != null && rewriters.size() == 1 && !rewriters.get( 0 ).allowOtherRewriters() )
+ if ( rewriters != null && rewriters.size() == 1 &&
+ ! ( ( URLRewriter ) rewriters.get( 0 ) ).allowOtherRewriters() )
{
return false;
}
@@ -266,7 +269,7 @@
{
if ( rewriter == null ) { return; }
- ArrayList< URLRewriter > rewriters = getRewriters( request );
+ ArrayList/*< URLRewriter >*/ rewriters = getRewriters( request );
if ( rewriters == null )
{
@@ -300,12 +303,13 @@
*/
public static boolean allowParamsOnFormAction( ServletContext servletContext, ServletRequest request )
{
- ArrayList< URLRewriter > rewriters = getRewriters( request );
+ ArrayList/*< URLRewriter >*/ rewriters = getRewriters( request );
if ( rewriters != null )
{
- for ( URLRewriter rewriter : rewriters )
+ for ( Iterator i = rewriters.iterator(); i.hasNext(); )
{
+ URLRewriter rewriter = ( URLRewriter ) i.next();
if ( !rewriter.allowParamsOnFormAction( servletContext, request ) ) { return false; }
}
}
@@ -322,7 +326,7 @@
*/
public static void dumpURLRewriters( ServletRequest request, PrintStream output )
{
- ArrayList< URLRewriter > rewriters = getRewriters( request );
+ ArrayList/*< URLRewriter >*/ rewriters = getRewriters( request );
if ( output == null ) output = System.err;
output.println( "*** List of URLRewriter objects: " + rewriters );
@@ -330,8 +334,9 @@
if ( rewriters != null )
{
int count = 0;
- for ( URLRewriter rewriter : rewriters )
+ for ( Iterator i = rewriters.iterator(); i.hasNext(); )
{
+ URLRewriter rewriter = ( URLRewriter ) i.next();
output.println( " " + count++ + ". " + rewriter.getClass().getName() );
output.println( " allows other rewriters: " + rewriter.allowOtherRewriters() );
output.println( " rewriter: " + rewriter );
Added: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLType.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLType.java?view=auto&rev=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLType.java (added)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLType.java Mon Apr 11 23:42:11 2005
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.core.urls;
+
+/**
+ * Passed to {@link URLRewriter#rewriteURL} for normal (non-resource) and resource, non-secure and
+ * secure URLs.
+ */
+public class URLType
+{
+ protected static final int INT_ACTION = 0;
+ protected static final int INT_RESOURCE = 1;
+
+ public static final URLType ACTION = new URLType( INT_ACTION );
+ public static final URLType RESOURCE = new URLType( INT_RESOURCE );
+
+ private int _val;
+
+ private URLType( int val )
+ {
+ _val = val;
+ }
+
+ public String toString()
+ {
+ switch ( _val )
+ {
+ case INT_ACTION: return "action";
+ case INT_RESOURCE: return "resource";
+ }
+
+ assert false : _val;
+ return "<unknown URLType>";
+ }
+
+ public boolean equals( Object o )
+ {
+ if ( o == null ) return false;
+ if ( o == this ) return true;
+ if ( ! ( o instanceof URLType ) ) return false;
+ return ( ( URLType ) o )._val == _val;
+ }
+
+ public int hashCode()
+ {
+ return _val;
+ }
+}
\ No newline at end of file
Propchange: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urls/URLType.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplate.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplate.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplate.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplate.java Mon Apr 11 23:42:11 2005
@@ -36,17 +36,17 @@
private String _template;
// Parsed representation of the template... list of literals and tokens.
- private ArrayList< TemplateItem > _parsedTemplate = null;
+ private ArrayList/*< TemplateItem >*/ _parsedTemplate = null;
private boolean _isParsed = false;
// The set of known tokens in a valid template.
- private Collection< String > _knownTokens = null;
+ private Collection/*< String >*/ _knownTokens = null;
// The set of required tokens in a valid template.
- private Collection< String > _requiredTokens = null;
+ private Collection/*< String >*/ _requiredTokens = null;
- private HashMap< String, String > _tokenValuesMap = new HashMap< String, String >();
+ private HashMap/*< String, String >*/ _tokenValuesMap = new HashMap/*< String, String >*/();
/**
* Create a URLTemplate from a url-template-config template.
@@ -64,7 +64,7 @@
* @param knownTokens The set of known tokens for a valid template.
* @param requiredTokens The set of required tokens in a valid template.
*/
- public URLTemplate( String template, Collection< String > knownTokens, Collection< String > requiredTokens )
+ public URLTemplate( String template, Collection/*< String >*/ knownTokens, Collection/*< String >*/ requiredTokens )
{
setTemplate( template );
_knownTokens = knownTokens;
@@ -132,8 +132,9 @@
// For each known token, make sure there is a leading and trailing brace
if ( _knownTokens != null )
{
- for ( String token : _knownTokens )
+ for ( java.util.Iterator ii = _knownTokens.iterator(); ii.hasNext(); )
{
+ String token = ( String ) ii.next();
if ( token != null && token.length() > 2 )
{
// Strip braces from the known token
@@ -158,8 +159,9 @@
// Check if the required tokens are present
if ( _requiredTokens != null )
{
- for ( String token : _requiredTokens )
+ for ( java.util.Iterator ii = _requiredTokens.iterator(); ii.hasNext(); )
{
+ String token = ( String ) ii.next();
String qualifiedToken = token;
TemplateItem requiredItem = new TemplateItem( qualifiedToken, true );
@@ -176,7 +178,7 @@
{
if ( _isParsed ) return;
- _parsedTemplate = new ArrayList< TemplateItem >();
+ _parsedTemplate = new ArrayList/*< TemplateItem >*/();
TemplateTokenizer tokenizer = new TemplateTokenizer( getTemplate() );
for ( ; tokenizer.hasNext(); )
{
@@ -194,7 +196,7 @@
* This assumes that there is an ordered one-to-one relationship. Tokens are
* expected to be qualified in braces. E.g. {url:path}
*/
- public void substitute( Map< String, String > tokensAndValues )
+ public void substitute( Map/*< String, String >*/ tokensAndValues )
{
if ( tokensAndValues != null )
{
@@ -234,14 +236,15 @@
parseTemplate();
}
- StringBuilder result = new StringBuilder( _template.length() + 16 );
- for ( TemplateItem item : _parsedTemplate )
+ StringBuffer result = new StringBuffer( _template.length() + 16 );
+ for ( java.util.Iterator ii = _parsedTemplate.iterator(); ii.hasNext(); )
{
+ TemplateItem item = ( TemplateItem ) ii.next();
if ( item.isToken() )
{
if ( _tokenValuesMap.containsKey( item.getValue() ) )
{
- appendToResult( result, _tokenValuesMap.get( item.getValue() ) );
+ appendToResult( result, ( String ) _tokenValuesMap.get( item.getValue() ) );
}
else
{
@@ -260,7 +263,7 @@
// check to make sure we don't end up with "//" between components
// of the URL
- private void appendToResult( StringBuilder result, String value )
+ private void appendToResult( StringBuffer result, String value )
{
if ( value == null || value.length() == 0 ) return;
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplateDescriptor.java Mon Apr 11 23:42:11 2005
@@ -56,11 +56,11 @@
public static final String QUERY_STRING_TOKEN = "{url:queryString}";
public static final String FRAGMENT_TOKEN = "{url:fragment}";
- private static final List<String> KNOWN_TEMPLATE_TOKENS =
- Arrays.asList( SCHEME_TOKEN, DOMAIN_TOKEN, PORT_TOKEN, FRAGMENT_TOKEN );
+ private static final List/*<String>*/ KNOWN_TEMPLATE_TOKENS =
+ Arrays.asList( new String[]{ SCHEME_TOKEN, DOMAIN_TOKEN, PORT_TOKEN, FRAGMENT_TOKEN } );
- private static final List<String> REQUIRED_TEMPLATE_TOKENS =
- Arrays.asList( PATH_TOKEN, QUERY_STRING_TOKEN );
+ private static final List/*<String>*/ REQUIRED_TEMPLATE_TOKENS =
+ Arrays.asList( new String[]{ PATH_TOKEN, QUERY_STRING_TOKEN } );
// URL templates
private URLTemplates _urlTemplates = new URLTemplates();
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplates.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplates.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplates.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplates.java Mon Apr 11 23:42:11 2005
@@ -25,9 +25,9 @@
*/
public class URLTemplates
{
- private HashMap< String, URLTemplate > _templates = new HashMap< String, URLTemplate >();
- private HashMap< String, Map< String, String > > _templateRefGroups =
- new HashMap< String, Map< String, String > >();
+ private HashMap/*< String, URLTemplate >*/ _templates = new HashMap/*< String, URLTemplate >*/();
+ private HashMap/*< String, Map< String, String > >*/ _templateRefGroups =
+ new HashMap/*< String, Map< String, String > >*/();
/**
* Add a template from url-template-config by name.
@@ -65,7 +65,7 @@
*/
public URLTemplate getTemplate( String templateName )
{
- URLTemplate template = _templates.get( templateName );
+ URLTemplate template = ( URLTemplate ) _templates.get( templateName );
if ( template == null ) return null;
return new URLTemplate( template );
@@ -77,7 +77,7 @@
* @param refGroupName the name of the template reference group.
* @param templateRefGroup the template reference group.
*/
- public void addTemplateRefGroup( String refGroupName, Map< String, String > templateRefGroup )
+ public void addTemplateRefGroup( String refGroupName, Map/*< String, String >*/ templateRefGroup )
{
if ( refGroupName == null || refGroupName.length() == 0 )
{
@@ -102,10 +102,10 @@
public String getTemplateNameByRef( String refGroupName, String key )
{
String templateName = null;
- Map< String, String > templateRefGroup = _templateRefGroups.get( refGroupName );
+ Map/*< String, String >*/ templateRefGroup = ( Map ) _templateRefGroups.get( refGroupName );
if ( templateRefGroup != null )
{
- templateName = templateRefGroup.get( key );
+ templateName = ( String ) templateRefGroup.get( key );
}
return templateName;
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/core/urltemplates/URLTemplatesFactory.java Mon Apr 11 23:42:11 2005
@@ -44,10 +44,10 @@
private static URLTemplateFileParser _parser = new DefaultURLTemplateFileParser();
// The set of known tokens in a valid template.
- private static Collection< String > _knownTokens = null;
+ private static Collection/*< String >*/ _knownTokens = null;
// The set of required tokens in a valid template.
- private static Collection< String > _requiredTokens = null;
+ private static Collection/*< String >*/ _requiredTokens = null;
/**
* Allow clients to set their own parser.
@@ -78,7 +78,7 @@
*
* @param knownTokens The set of known tokens for a valid template.
*/
- public static void setKnownTokens( Collection< String > knownTokens )
+ public static void setKnownTokens( Collection/*< String >*/ knownTokens )
{
_knownTokens = knownTokens;
}
@@ -93,7 +93,7 @@
*
* @param requiredTokens The set of required tokens in a valid template.
*/
- public static void setRequiredTokens( Collection< String > requiredTokens )
+ public static void setRequiredTokens( Collection/*< String >*/ requiredTokens )
{
_requiredTokens = requiredTokens;
}
@@ -185,7 +185,7 @@
UrlTemplateRefGroupDocument.UrlTemplateRefGroup[] templateRefGroups = urlTemplateConfig.getUrlTemplateRefGroupArray ();
for ( int i = 0; i < templateRefGroups.length; i++ )
{
- HashMap< String, String > refGroup = new HashMap< String, String >();
+ HashMap/*< String, String >*/ refGroup = new HashMap/*< String, String >*/();
String refGroupName = templateRefGroups[i].getName().toString().trim();
UrlTemplateRefDocument.UrlTemplateRef[] templateRefs = templateRefGroups[i].getUrlTemplateRefArray();
for ( int j = 0; j < templateRefs.length; j++ )
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java Mon Apr 11 23:42:11 2005
@@ -76,7 +76,7 @@
public static Class[] getImplementorClasses( Class interfaceType )
{
String interfaceName = interfaceType.getName();
- ArrayList< Class > classes = new ArrayList< Class >();
+ ArrayList/*< Class >*/ classes = new ArrayList/*< Class >*/();
ClassLoader classLoader = getClassLoader();
try
@@ -118,7 +118,7 @@
_log.error( "Could not discover implementors for " + interfaceName, e );
}
- return classes.toArray( new Class[0] );
+ return ( Class[] ) classes.toArray( new Class[0] );
}
public static Object newImplementorInstance( String className, Class interfaceType )
Modified: incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java?view=diff&r1=161024&r2=161025
==============================================================================
--- incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java (original)
+++ incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/HtmlExceptionFormatter.java Mon Apr 11 23:42:11 2005
@@ -57,7 +57,7 @@
* @return the formatted error message, optionally including the stack trace.
*/
public static String format(String message, Throwable t, boolean includeStackTrace) {
- StringBuilder buf = new StringBuilder();
+ StringBuffer buf = new StringBuffer();
if(message != null) {
buf.append(message);
@@ -92,7 +92,7 @@
}
private static final String addStackTrace(Throwable t) {
- StringBuilder buf = new StringBuilder();
+ StringBuffer buf = new StringBuffer();
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
@@ -136,4 +136,4 @@
return cause;
}
-}
\ No newline at end of file
+}