Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java Mon Apr 11 23:42:11 2005 @@ -78,7 +78,7 @@ } protected String buildLiveFirstLink() { - StringBuilder builder = new StringBuilder(); + StringBuffer builder = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(builder); buildAnchor(appender, _gridModel.getUrlBuilder().getQueryParamsForFirstPage(), IDataGridMessageKeys.PAGER_MSG_FIRST); @@ -91,7 +91,7 @@ } protected String buildLivePreviousLink() { - StringBuilder builder = new StringBuilder(); + StringBuffer builder = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(builder); buildAnchor(appender, _gridModel.getUrlBuilder().getQueryParamsForPreviousPage(), IDataGridMessageKeys.PAGER_MSG_PREVIOUS); @@ -104,7 +104,7 @@ } protected String buildLiveNextPageLink() { - StringBuilder builder = new StringBuilder(); + StringBuffer builder = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(builder); buildAnchor(appender, _gridModel.getUrlBuilder().getQueryParamsForNextPage(), IDataGridMessageKeys.PAGER_MSG_NEXT); return builder.toString(); @@ -115,7 +115,7 @@ } protected String buildLiveLastLink() { - StringBuilder builder = new StringBuilder(); + StringBuffer builder = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(builder); buildAnchor(appender, _gridModel.getUrlBuilder().getQueryParamsForLastPage(), IDataGridMessageKeys.PAGER_MSG_LAST); return builder.toString();
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java Mon Apr 11 23:42:11 2005 @@ -75,7 +75,7 @@ public abstract String getDataCellFilteredClass(); - public String buildStyleClassValue(List<String> styleClasses) { + public String buildStyleClassValue(List/*<String>*/ styleClasses) { if(styleClasses == null) return EMPTY; @@ -104,7 +104,7 @@ /* @todo: perf - could cache the style names once they've been produced */ private final String prefix(String style) { - StringBuilder sb = new StringBuilder(16); + StringBuffer sb = new StringBuffer(16); sb.append(_stylePrefix); if(style != null) { sb.append(DELIM); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java Mon Apr 11 23:42:11 2005 @@ -19,8 +19,51 @@ /** */ -public enum SortDirection { - ASCENDING, - DESCENDING, - NONE; +public class SortDirection +{ + public static final int INT_ASCENDING = 0; + public static final int INT_DESCENDING = 1; + public static final int INT_NONE = 2; + + public static final SortDirection ASCENDING = new SortDirection(INT_ASCENDING); + public static final SortDirection DESCENDING = new SortDirection(INT_DESCENDING); + public static final SortDirection NONE = new SortDirection(INT_NONE); + + private int _val; + + private SortDirection( int val ) + { + _val = val; + } + + public String toString() + { + switch ( _val ) + { + case INT_ASCENDING: return "ASCENDING"; + case INT_DESCENDING: return "DESCENDING"; + case INT_NONE: return "NONE"; + } + + assert false : _val; + return "<unknown SortDirection>"; + } + + public boolean equals( Object o ) + { + if ( o == null ) return false; + if ( o == this ) return true; + if ( ! ( o instanceof SortDirection ) ) return false; + return ( ( SortDirection ) o )._val == _val; + } + + public int hashCode() + { + return _val; + } + + public int getValue() + { + return _val; + } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java Mon Apr 11 23:42:11 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.databinding.datagrid.api.sort; import java.util.List; +import java.util.Iterator; /** * @@ -27,9 +28,9 @@ /* todo: consider exposing a Map getSortMap() that would be JSP 2.0 EL bindable */ private SortStrategy _sortStrategy = null; - private List<Sort> _sorts = null; + private List/*<Sort>*/ _sorts = null; - public SortModel(List<Sort> sorts) { + public SortModel(List/*<Sort>*/ sorts) { _sorts = sorts; } @@ -41,7 +42,7 @@ _sortStrategy = sortStrategy; } - public List<Sort> getSorts() { + public List/*<Sort>*/ getSorts() { if(_sorts == null) return null; else return _sorts; @@ -54,7 +55,7 @@ /* optimizing for the case where the sortExpression *is* the primary sort */ if(_sorts != null && _sorts.size() > 0 && - _sorts.get(0).getSortExpression().equals(sortExpression)) { + ((Sort)_sorts.get(0)).getSortExpression().equals(sortExpression)) { return true; } else return false; @@ -84,7 +85,8 @@ if(_sorts == null) return null; - for(Sort sort : _sorts) { + for ( Iterator i = _sorts.iterator(); i.hasNext(); ) { + Sort sort = ( Sort ) i.next(); if(sort.getSortExpression().equals(sortExpression)) return sort; } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java Mon Apr 11 23:42:11 2005 @@ -63,13 +63,13 @@ return new Filter(); } - public SortModel createSortModel(List<Sort> sorts) { + public SortModel createSortModel(List/*<Sort>*/ sorts) { SortModel sortModel = new SortModel(sorts); sortModel.setSortStrategy(SORT_STRATEGY); return sortModel; } - public FilterModel createFilterModel(List<Filter> filters) { + public FilterModel createFilterModel(List/*<Filter>*/ filters) { return new FilterModel(filters); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java Mon Apr 11 23:42:11 2005 @@ -33,6 +33,7 @@ import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperation; import org.apache.beehive.netui.databinding.datagrid.api.DataGridStateCodec; import org.apache.beehive.netui.databinding.datagrid.api.DataGridConfig; +import org.apache.beehive.netui.databinding.datagrid.api.DataGridURLBuilder; import org.apache.beehive.netui.databinding.datagrid.runtime.sql.SQLSupport; import org.apache.beehive.netui.util.logging.Logger; import org.apache.beehive.netui.util.Bundle; @@ -88,12 +89,12 @@ return _state; } - public void setDataGridState(DataGridState state) { - _state = state; + public DataGridURLBuilder getDataGridURLBuilder() { + return _urlBuilder; } - public DefaultDataGridURLBuilder getDataGridURLBuilder() { - return _urlBuilder; + public void setDataGridState(DataGridState state) { + _state = state; } /** @@ -137,15 +138,15 @@ Map buildPageParamMap(Integer row, Integer pageSize) { HashMap map = new HashMap(); if(row != null && row.intValue() != DEFAULT_ROW) - map.put(PARAM_KEY_ROW, new String[] {encodeRow(row)}); + map.put(PARAM_KEY_ROW, new String[] {encodeRow(row.intValue())}); /* only encode the page size if it is not equal to the default page size for this data grid for example, if a data grid's default page size is 20 but is set somehow by the application to be 50, the default will read 20 but overridden pageSize value should be encoded in the URL */ - if(pageSize != null && pageSize != _state.getPagerModel().getDefaultPageSize()) - map.put(PARAM_KEY_PAGE_SIZE, new String[] {encodePageSize(pageSize)}); + if(pageSize != null && pageSize.intValue() != _state.getPagerModel().getDefaultPageSize()) + map.put(PARAM_KEY_PAGE_SIZE, new String[] {encodePageSize(pageSize.intValue())}); return map; } @@ -187,7 +188,7 @@ for(int i = 0; i < values.length; i++) { String value = values[i]; if(value.startsWith(namespacePrefix)) - row = decodeRow(value); + row = decodeRow(value).intValue(); else addParam(key, value); } PagerModel pagerModel = _state.getPagerModel(); @@ -202,7 +203,7 @@ for(int i = 0; i < values.length; i++) { String value = values[i]; if(value.startsWith(namespacePrefix)) - pageSize = decodeRow(value); + pageSize = decodeRow(value).intValue(); else addParam(key, value); } PagerModel pagerModel = _state.getPagerModel(); @@ -255,7 +256,7 @@ private int decodeInt(String value, int defaultValue) { int intValue = defaultValue; try { - intValue = new Integer(value); + intValue = Integer.parseInt(value); } catch(NumberFormatException nfe) { LOGGER.error(Bundle.getErrorString("DataGridStateCodec_IllegalIntegerValue", new Object[] {value, nfe})); } @@ -279,7 +280,8 @@ // two columns of the bugs grid would be sorted as: // // netui_sort=bugs~id,-priority - for(String sort : sortStrings) { + for (int i = 0; i < sortStrings.length; i++) { + String sort = sortStrings[i]; SortDirection sortDirection = SortDirection.NONE; if(sort.startsWith("-")) sortDirection = SortDirection.DESCENDING; @@ -296,7 +298,7 @@ String encodeSorts(List sorts) { boolean hasSorts = false; - StringBuilder sb = new StringBuilder(16); + StringBuffer sb = new StringBuffer(16); sb.append(getGridName()); sb.append(DELIM_GRID_NAME); for(int i = 0; i < sorts.size(); i++) { @@ -330,7 +332,7 @@ String namespace = nameAndFilters[0]; String[] filters = nameAndFilters[1].split(DELIM_FILTER_TERM); - ArrayList<Filter> gridFilters = new ArrayList<Filter>(); + ArrayList/*<Filter>*/ gridFilters = new ArrayList/*<Filter>*/(); for(int i = 0; i < filters.length; i++) { String[] terms = filters[i].split(DELIM_FILTER); Filter filter = null; @@ -356,7 +358,7 @@ String encodeFilters(List filters) { boolean hasFilters = false; - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); sb.append(getGridName()); sb.append(DELIM_GRID_NAME); for(int i = 0; i < filters.size(); i++) { @@ -390,7 +392,7 @@ } String encodeRow(final int row) { - StringBuilder sb = new StringBuilder(16); + StringBuffer sb = new StringBuffer(16); sb.append(getGridName()); sb.append(DELIM_GRID_NAME); sb.append(row); @@ -407,10 +409,10 @@ } String encodePageSize(final int pageSize) { - StringBuilder sb = new StringBuilder(16); + StringBuffer sb = new StringBuffer(16); sb.append(getGridName()); sb.append(DELIM_GRID_NAME); sb.append(pageSize); return sb.toString(); } -} \ No newline at end of file +} Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java Mon Apr 11 23:42:11 2005 @@ -72,8 +72,8 @@ addSortParams(newParams); addFilterParams(newParams); - newParams.putAll(_codec.buildPageParamMap(pagerModel.getFirstPage() * pagerModel.getPageSize(), - pagerModel.getPageSize())); + newParams.putAll(_codec.buildPageParamMap(new Integer(pagerModel.getFirstPage() * pagerModel.getPageSize()), + new Integer(pagerModel.getPageSize()))); params = mergeMaps(params, newParams); params = transformMap(params); @@ -90,8 +90,8 @@ addSortParams(newParams); addFilterParams(newParams); - newParams.putAll(_codec.buildPageParamMap(pagerModel.getPreviousPage() * pagerModel.getPageSize(), - pagerModel.getPageSize())); + newParams.putAll(_codec.buildPageParamMap(new Integer(pagerModel.getPreviousPage() * pagerModel.getPageSize()), + new Integer(pagerModel.getPageSize()))); params = mergeMaps(params, newParams); params = transformMap(params); @@ -108,8 +108,8 @@ addSortParams(newParams); addFilterParams(newParams); - newParams.putAll(_codec.buildPageParamMap(pagerModel.getNextPage() * pagerModel.getPageSize(), - pagerModel.getPageSize())); + newParams.putAll(_codec.buildPageParamMap(new Integer(pagerModel.getNextPage() * pagerModel.getPageSize()), + new Integer(pagerModel.getPageSize()))); params = mergeMaps(params, newParams); params = transformMap(params); @@ -126,8 +126,8 @@ addSortParams(newParams); addFilterParams(newParams); - newParams.putAll(_codec.buildPageParamMap(pagerModel.getLastPage() * pagerModel.getPageSize(), - pagerModel.getPageSize())); + newParams.putAll(_codec.buildPageParamMap(new Integer(pagerModel.getLastPage() * pagerModel.getPageSize()), + new Integer(pagerModel.getPageSize()))); params = mergeMaps(params, newParams); params = transformMap(params); @@ -215,7 +215,8 @@ } private void addPagerParams(Map map) { - Map tmp = _codec.buildPageParamMap(getDataGridState().getPagerModel().getRow(), getDataGridState().getPagerModel().getPageSize()); + Map tmp = _codec.buildPageParamMap(new Integer(getDataGridState().getPagerModel().getRow()), + new Integer(getDataGridState().getPagerModel().getPageSize())); if(tmp != null) map.putAll(tmp); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java Mon Apr 11 23:42:11 2005 @@ -76,7 +76,7 @@ SortModel sortModel = dgm.getState().getSortModel(); - StringBuilder builder = new StringBuilder(); + StringBuffer builder = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(builder); TagRenderingBase imageRenderer = TagRenderingBase.Factory.getRendering(TagRenderingBase.IMAGE_TAG, request); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java Mon Apr 11 23:42:11 2005 @@ -28,14 +28,14 @@ extends PagerRenderer { protected String internalRender() { - StringBuilder buf = new StringBuilder(); + StringBuffer buf = new StringBuffer(); PagerModel pagerModel = getPagerModel(); int currentPage = pagerModel.getPage(); int lastPage = pagerModel.getLastPage(); /* Page # of # First / Previous Next / Last */ buf.append(getDataGridTagModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER, - new Integer[]{currentPage + 1, pagerModel.getLastPage() + 1})); + new Integer[]{new Integer(currentPage + 1), new Integer(pagerModel.getLastPage() + 1)})); buf.append(" "); if(currentPage > pagerModel.getFirstPage()) Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java Mon Apr 11 23:42:11 2005 @@ -25,14 +25,14 @@ extends PagerRenderer { protected String internalRender() { - StringBuilder buf = new StringBuilder(); + StringBuffer buf = new StringBuffer(); PagerModel pagerModel = getPagerModel(); int currentPage = pagerModel.getPage(); int lastPage = pagerModel.getLastPage(); buf.append(getDataGridTagModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER, - new Integer[]{currentPage + 1, - pagerModel.getLastPage() + 1})); + new Integer[]{new Integer(currentPage + 1), + new Integer(pagerModel.getLastPage() + 1)})); buf.append(" "); if(pagerModel.getPreviousPage() >= 0) buf.append(buildLivePreviousLink()); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java Mon Apr 11 23:42:11 2005 @@ -71,7 +71,7 @@ * signature="java.util.Map lookupFilterOperations(java.lang.String)" */ public static Map lookupFilterOperationLabels(String typeHint) { - LinkedHashMap ops = new LinkedHashMap<String, String>(); + LinkedHashMap ops = new LinkedHashMap/*<String, String>*/(); /* todo: i18n */ ops.put(FILTER_OPERATIONS[0].getAbbreviation(), "No Filter"); @@ -82,11 +82,11 @@ ops.put(FILTER_OPERATIONS[5].getAbbreviation(), "Is Greater Than or Equal To"); ops.put(FILTER_OPERATIONS[6].getAbbreviation(), "Is Less Than or Equal To"); - if(!(FilterTypeHint.DATE == FilterTypeHint.getTypeHint(typeHint))) { + if(!(FilterTypeHint.DATE.equals(FilterTypeHint.getTypeHint(typeHint)))) { ops.put(FILTER_OPERATIONS[7].getAbbreviation(), "Is One Of (eg: 1;2;3)"); } - if(typeHint == null || FilterTypeHint.STRING == FilterTypeHint.getTypeHint(typeHint)) { + if(typeHint == null || FilterTypeHint.STRING.equals(FilterTypeHint.getTypeHint(typeHint))) { ops.put(FILTER_OPERATIONS[8].getAbbreviation(), "Starts With"); ops.put(FILTER_OPERATIONS[9].getAbbreviation(), "Contains"); ops.put(FILTER_OPERATIONS[10].getAbbreviation(), "Is Empty"); @@ -104,14 +104,15 @@ */ public static String lookoupDefaultFilterOperationAbbreviation(String typeHint) { FilterOperation fOp = OTHER_FILTER_OPERATION; - if(typeHint == null || FilterTypeHint.STRING == FilterTypeHint.getTypeHint(typeHint)) + if(typeHint == null || FilterTypeHint.STRING.equals(FilterTypeHint.getTypeHint(typeHint))) fOp = STRING_FILTER_OPERATION; return fOp.getAbbreviation(); } public static final FilterOperation mapFilterAbbreviationToOperation(String abbrev) { - for(FilterOperation fOp : FILTER_OPERATIONS) { + for (int i = 0; i < FILTER_OPERATIONS.length; i++) { + FilterOperation fOp = FILTER_OPERATIONS[i]; if(fOp.getAbbreviation().equals(abbrev)) return fOp; } @@ -119,7 +120,8 @@ } public static final FilterOperation mapFilterHintToOperation(FilterOperationHint hint) { - for(FilterOperation op : FILTER_OPERATIONS) { + for (int i = 0; i < FILTER_OPERATIONS.length; i++) { + FilterOperation op = FILTER_OPERATIONS[i]; if(op.getOperationHint().equals(hint)) return op; } @@ -130,47 +132,47 @@ private SQLSupport() { } - public final String createOrderByFragment(List<Sort> sorts) { + public final String createOrderByFragment(List/*<Sort>*/ sorts) { if(sorts == null || sorts.size() == 0) return EMPTY_STRING; - StringBuilder sql = new StringBuilder(); + StringBuffer sql = new StringBuffer(); internalCreateOrderByFragment(sql, sorts); return sql.toString(); } - public final String createOrderByClause(List<Sort> sorts) { + public final String createOrderByClause(List/*<Sort>*/ sorts) { if(sorts == null || sorts.size() == 0) return EMPTY_STRING; - StringBuilder sql = new StringBuilder(64); + StringBuffer sql = new StringBuffer(64); sql.append("ORDER BY "); internalCreateOrderByFragment(sql, sorts); return sql.toString(); } - public String createWhereFragment(List<Filter> filters) { + public String createWhereFragment(List/*<Filter>*/ filters) { if(filters == null || filters.size() == 0) return EMPTY_STRING; - StringBuilder sql = new StringBuilder(64); + StringBuffer sql = new StringBuffer(64); internalCreateWhereFragment(sql, filters); return sql.toString(); } - public String createWhereClause(List<Filter> filters) { + public String createWhereClause(List/*<Filter>*/ filters) { if(filters == null || filters.size() == 0) return EMPTY_STRING; - StringBuilder sql = new StringBuilder(); + StringBuffer sql = new StringBuffer(); sql.append("WHERE "); internalCreateWhereFragment(sql, filters); return sql.toString(); } - private void internalCreateOrderByFragment(StringBuilder sql, List<Sort> sorts) { + private void internalCreateOrderByFragment(StringBuffer sql, List/*<Sort>*/ sorts) { for(int i = 0; i < sorts.size(); i++) { - Sort sort = sorts.get(i); + Sort sort = (Sort) sorts.get(i); if(i > 0) sql.append(", "); sql.append(sort.getSortExpression()); @@ -179,10 +181,10 @@ } } - private void internalCreateWhereFragment(StringBuilder sql, List<Filter> filters) { + private void internalCreateWhereFragment(StringBuffer sql, List/*<Filter>*/ filters) { for(int i = 0; i < filters.size(); i++) { - Filter filter = filters.get(i); + Filter filter = (Filter) filters.get(i); /* todo: feature. pluggable conjunctions AND and OR here */ if(i > 0) @@ -201,9 +203,9 @@ } } - switch(filter.getOperation().getOperationHint()) { - case STARTS_WITH: - case CONTAINS: + switch(filter.getOperation().getOperationHint().getValue()) { + case FilterOperationHint.INT_STARTS_WITH: + case FilterOperationHint.INT_CONTAINS: { boolean bEscape = true; /* todo: there is architectural work needed here to return a SQLSupport instance that exposes getter / setter methods for the things DatabaseMetaData is used for */ @@ -224,22 +226,22 @@ sql.append(')'); break; } - case IS_NOT_EMPTY: + case FilterOperationHint.INT_IS_NOT_EMPTY: { sql.append("(").append(filter.getFilterExpression()).append(" IS NOT NULL)"); break; } - case IS_EMPTY: + case FilterOperationHint.INT_IS_EMPTY: { sql.append("(").append(filter.getFilterExpression()).append(" IS NULL)"); break; } - case EQUAL: - case LESS_THAN: - case LESS_THAN_OR_EQUAL: - case GREATER_THAN: - case GREATER_THAN_OR_EQUAL: - case NOT_EQUAL: + case FilterOperationHint.INT_EQUAL: + case FilterOperationHint.INT_LESS_THAN: + case FilterOperationHint.INT_LESS_THAN_OR_EQUAL: + case FilterOperationHint.INT_GREATER_THAN: + case FilterOperationHint.INT_GREATER_THAN_OR_EQUAL: + case FilterOperationHint.INT_NOT_EQUAL: { /* todo: conider using SQLFragment from the DatabaseControl here. */ sql.append("("); @@ -254,7 +256,7 @@ sql.append(")"); break; } - case IS_ONE_OF: + case FilterOperationHint.INT_IS_ONE_OF: { Object[] arr; if(filter.getValue().getClass().isArray()) @@ -297,8 +299,8 @@ return s; } - private void addParameter(StringBuilder sql, Object value, FilterTypeHint typeHint) { - if(typeHint == FilterTypeHint.STRING) { + private void addParameter(StringBuffer sql, Object value, FilterTypeHint typeHint) { + if(typeHint.equals(FilterTypeHint.STRING)) { sql.append(QUOTE_CHAR); sql.append(value); sql.append(QUOTE_CHAR); @@ -308,13 +310,13 @@ } private String lookupOperator(FilterOperationHint op) { - switch(op) { - case EQUAL: return "="; - case NOT_EQUAL: return "!="; - case GREATER_THAN: return ">"; - case LESS_THAN: return "<"; - case GREATER_THAN_OR_EQUAL: return ">="; - case LESS_THAN_OR_EQUAL : return "<="; + switch(op.getValue()) { + case FilterOperationHint.INT_EQUAL: return "="; + case FilterOperationHint.INT_NOT_EQUAL: return "!="; + case FilterOperationHint.INT_GREATER_THAN: return ">"; + case FilterOperationHint.INT_LESS_THAN: return "<"; + case FilterOperationHint.INT_GREATER_THAN_OR_EQUAL: return ">="; + case FilterOperationHint.INT_LESS_THAN_OR_EQUAL : return "<="; default: assert false : "lookupOperation received an invalid FilterOperation: " + op; } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java Mon Apr 11 23:42:11 2005 @@ -34,11 +34,11 @@ */ public final class JspFunctions { - private static final List<Filter> DEFAULT_FILTER_LIST; + private static final List/*<Filter>*/ DEFAULT_FILTER_LIST; private static final Filter DEFAULT_FILTER = DataGridConfigFactory.getInstance().createFilter(); static { - DEFAULT_FILTER_LIST = new ArrayList<Filter>(); + DEFAULT_FILTER_LIST = new ArrayList/*<Filter>*/(); DEFAULT_FILTER_LIST.add(DEFAULT_FILTER); DEFAULT_FILTER_LIST.add(DEFAULT_FILTER); } @@ -111,8 +111,8 @@ * signature="void ensureFilters(javax.servlet.jsp.JspContext,java.lang.String)" */ public static void ensureFilters(JspContext jspContext, String attrName) { - List<Filter> filters = (List<Filter>)jspContext.getAttribute("filters"); - List<Filter> pcFilters = new ArrayList<Filter>(); + List/*<Filter>*/ filters = (List/*<Filter>*/)jspContext.getAttribute("filters"); + List/*<Filter>*/ pcFilters = new ArrayList/*<Filter>*/(); if(filters == null || filters.size() == 0) pcFilters = DEFAULT_FILTER_LIST; Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/base/style/AbstractStyleBean.java Mon Apr 11 23:42:11 2005 @@ -24,7 +24,7 @@ * <br/> * <br/> * Two basic methods are provided for rendering table and row styles into a - * [EMAIL PROTECTED] StringBuilder}. + * [EMAIL PROTECTED] StringBuffer}. */ public abstract class AbstractStyleBean { @@ -71,7 +71,7 @@ /** * A method that will render the style class into the - * [EMAIL PROTECTED] StringBuilder}. + * [EMAIL PROTECTED] StringBuffer}. */ public String renderTableStyle() { return renderStyle(getTableClass()); @@ -79,16 +79,16 @@ /** * A method that will render the style class into the - * [EMAIL PROTECTED] StringBuilder}. + * [EMAIL PROTECTED] StringBuffer}. */ public String renderRowStyle() { return renderStyle(getRowClass()); } /** - * Render the style class into the [EMAIL PROTECTED] StringBuilder}. If the + * Render the style class into the [EMAIL PROTECTED] StringBuffer}. If the * style class <code>style</code> is not null, it is appended into the - * StringBuilder with the HTML tag attribute "class". A space is inserted + * StringBuffer with the HTML tag attribute "class". A space is inserted * at the front of the attribute but not at the end, so a <code>style</code> * value of "foo" will render as: * <pre> @@ -100,7 +100,7 @@ protected String renderStyle(String style) { if(style == null) return EMPTY_STRING; - StringBuilder buf = new StringBuilder(); + StringBuffer buf = new StringBuffer(); buf.append(" class=\""); buf.append(style); buf.append("\""); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java Mon Apr 11 23:42:11 2005 @@ -155,7 +155,7 @@ private int _currentRow = -1; private int _currentColumn = -1; private int _rows = DEFAULT_DIMENSION_VALUE; - private StringBuilder _contentBuffer = null; + private StringBuffer _contentBuffer = null; private ArrayList _dataList = null; private Object _currentItem = null; private CellRepeaterStyleBean _styleContext = new CellRepeaterStyleBean(); @@ -181,7 +181,7 @@ public void addContent(String content) { if(_contentBuffer == null) { int size = (content != null ? (5 * content.length()) : 512); - _contentBuffer = new StringBuilder(size); + _contentBuffer = new StringBuffer(size); } _contentBuffer.append(content); @@ -662,7 +662,7 @@ if(_styleContext == null) return "<table>"; - StringBuilder buf = new StringBuilder("<table"); + StringBuffer buf = new StringBuffer("<table"); buf.append(_styleContext.renderTableStyle()); buf.append(">"); @@ -673,7 +673,7 @@ if(_styleContext == null) return "<tr>"; - StringBuilder buf = new StringBuilder("<tr"); + StringBuffer buf = new StringBuffer("<tr"); buf.append(_styleContext.renderRowStyle()); buf.append(">"); @@ -684,7 +684,7 @@ if(_styleContext == null) return "<td>"; - StringBuilder buf = new StringBuilder("<td"); + StringBuffer buf = new StringBuffer("<td"); if(index % 2 == 0) buf.append(_styleContext.renderCellStyle()); else Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java Mon Apr 11 23:42:11 2005 @@ -79,7 +79,7 @@ try { DataGridUtil.putCellModel(getJspContext(), model); - StringBuilder content = new StringBuilder(); + StringBuffer content = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(content); renderCell(appender); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java Mon Apr 11 23:42:11 2005 @@ -465,7 +465,7 @@ assert tableRenderer != null; /* todo: refactor. extensibility in supporting style decorators */ - ArrayList<String> styleClasses = new ArrayList<String>(); + ArrayList/*<String>*/ styleClasses = new ArrayList/*<String>*/(); FilterModel filterModel = dataGridModel.getState().getFilterModel(); if(_filterExpression != null && filterModel.isFiltered(_filterExpression)) styleClasses.add(dataGridModel.getStyleModel().getDataCellFilteredClass()); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java Mon Apr 11 23:42:11 2005 @@ -64,7 +64,7 @@ * @netui:attribute required="false" rtexprvalue="true" */ public void setPageSize(int pageSize) { - _pageSize = pageSize; + _pageSize = new Integer(pageSize); } /** @@ -105,7 +105,7 @@ * @netui:attribute required="false" rtexprvalue="true" */ public void setDisableDefaultPager(boolean disableDefaultPager) { - _disableDefaultPager = disableDefaultPager; + _disableDefaultPager = Boolean.valueOf(disableDefaultPager); } /** @@ -142,10 +142,10 @@ dgm.setDisableDefaultPagerRendering(_disableDefaultPager.booleanValue()); if(_pageSize != null) - pm.setPageSize(_pageSize); + pm.setPageSize(_pageSize.intValue()); if(_defaultPageSize != null) - pm.setDefaultPageSize(_defaultPageSize); + pm.setDefaultPageSize(_defaultPageSize.intValue()); PagerRenderer pagerRenderer = null; if(_pagerRendererClass != null) { Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java Mon Apr 11 23:42:11 2005 @@ -196,7 +196,7 @@ if(fragment != null) { boolean addedDataAccessProvider = false; try { - StringBuilder builder = new StringBuilder(2048); + StringBuffer builder = new StringBuffer(2048); AbstractRenderAppender appender = new StringBuilderRenderAppender(builder); /* todo: perf -- this doesn't need to happen when the data set is empty */ @@ -320,4 +320,4 @@ public IDataAccessProvider getProviderParent() { return (IDataAccessProvider)SimpleTagSupport.findAncestorWithClass(this, IDataAccessProvider.class); } -} \ No newline at end of file +} Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java Mon Apr 11 23:42:11 2005 @@ -336,7 +336,7 @@ if(gridRenderState == DataGridTagModel.RENDER_STATE_HEADER) { /* todo: replace StringBuilderRenderAppender with WriteRenderAppender */ - StringBuilder content = new StringBuilder(); + StringBuffer content = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(content); StyleModel styleModel = dgm.getStyleModel(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java Mon Apr 11 23:42:11 2005 @@ -560,7 +560,7 @@ TableRenderer tableRenderer = dataGridModel.getTableRenderer(); assert tableRenderer != null; - ArrayList<String> styleClasses = new ArrayList<String>(); + ArrayList/*<String>*/ styleClasses = new ArrayList/*<String>*/(); /* todo: refactor. add a chain of style decorators here; easier to extend this way. */ FilterModel filterModel = dataGridModel.getState().getFilterModel(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java Mon Apr 11 23:42:11 2005 @@ -341,7 +341,7 @@ TableRenderer tableRenderer = dataGridModel.getTableRenderer(); assert tableRenderer != null; - StringBuilder content = new StringBuilder(); + StringBuffer content = new StringBuffer(); AbstractRenderAppender appender = new StringBuilderRenderAppender(content); JspFragment fragment = getJspBody(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java Mon Apr 11 23:42:11 2005 @@ -464,9 +464,9 @@ * @return a String that represents the types of each of these paramters in order */ private static final String prettyPrintParameterTypes(List parameters) { - StringBuilder paramString = null; + StringBuffer paramString = null; if(parameters != null) { - paramString = new StringBuilder(128); + paramString = new StringBuffer(128); paramString.append("("); for(int i = 0; i < parameters.size(); i++) { if(i > 0) @@ -505,7 +505,7 @@ public Object paramValue = null; public String toString() { - StringBuilder buf = new StringBuilder(32); + StringBuffer buf = new StringBuffer(32); buf.append("typeName: ").append(typeName); return buf.toString(); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java Mon Apr 11 23:42:11 2005 @@ -216,4 +216,4 @@ if(hasErrors()) reportErrors(); } -} \ No newline at end of file +} Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java Mon Apr 11 23:42:11 2005 @@ -206,7 +206,7 @@ private Object _currentItem = null; private Iterator _iterator = null; private PadContext _padContext = null; - private StringBuilder _contentBuffer = null; + private StringBuffer _contentBuffer = null; /** * Get the name of this tag. This is used to identify the type of this tag @@ -337,7 +337,7 @@ public void addContent(String content) { if(_contentBuffer == null) { int size = (content != null ? (5 * content.length()) : 1024); - _contentBuffer = new StringBuilder(size); + _contentBuffer = new StringBuffer(size); } _contentBuffer.append(content); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java Mon Apr 11 23:42:11 2005 @@ -192,4 +192,4 @@ throws JspException { return EVAL_PAGE; } -} \ No newline at end of file +} Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/PadContext.java Mon Apr 11 23:42:11 2005 @@ -106,7 +106,7 @@ * @return a String representation of the PadContext */ public String toString() { - StringBuilder buf = new StringBuilder(32); + StringBuffer buf = new StringBuffer(32); buf.append("\nPadContext: "); buf.append("padText: " + _padText + "\n"); buf.append("minRepeat: " + _minRepeat + "\n"); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java Mon Apr 11 23:42:11 2005 @@ -68,7 +68,7 @@ XmlObject xmlObject = (XmlObject)_source; String xml = xmlObject.xmlText(); - StringBuilder buf = new StringBuilder(); + StringBuffer buf = new StringBuffer(); buf.append("<div"); buf.append(" id=\""); buf.append(_divName); Modified: incubator/beehive/trunk/netui/src/tags-html/build.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/build.xml?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/build.xml (original) +++ incubator/beehive/trunk/netui/src/tags-html/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> Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java Mon Apr 11 23:42:11 2005 @@ -264,14 +264,14 @@ final protected String getIdForTagId(String tagId) { HttpServletRequest req = (HttpServletRequest) pageContext.getRequest(); - ArrayList<String> list = (ArrayList<String>) + ArrayList/*<String>*/ list = (ArrayList/*<String>*/) org.apache.beehive.netui.tags.RequestUtils.getOuterAttribute(req, ScriptContainer.SCOPE_ID); if (list == null) return tagId; - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); for (int i=0;i<list.size();i++) { - sb.append(list.get(i)); + sb.append((String)list.get(i)); sb.append('.'); } sb.append(tagId); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractSimpleTag.java Mon Apr 11 23:42:11 2005 @@ -258,14 +258,14 @@ final protected String getIdForTagId(String tagId) { HttpServletRequest req = (HttpServletRequest) getPageContext().getRequest(); - ArrayList<String> list = (ArrayList<String>) + ArrayList/*<String>*/ list = (ArrayList/*<String>*/) org.apache.beehive.netui.tags.RequestUtils.getOuterAttribute(req, ScriptContainer.SCOPE_ID); if (list == null) return tagId; - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); for (int i=0;i<list.size();i++) { - sb.append(list.get(i)); + sb.append((String) list.get(i)); sb.append('.'); } sb.append(tagId); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/ErrorHandling.java Mon Apr 11 23:42:11 2005 @@ -156,7 +156,7 @@ int cnt = _errors.size(); - StringBuilder sb = new StringBuilder(128); + StringBuffer sb = new StringBuffer(128); // check the first error to see if we are reporting errors at the end AbstractPageError info = (AbstractPageError) _errors.get(0); @@ -204,7 +204,7 @@ * This method get the current errors and write the formated output * @param sb */ - public static void reportCollectedErrors(StringBuilder sb, JspTag tag) + public static void reportCollectedErrors(StringBuffer sb, JspTag tag) { IErrorReporter er = getErrorReporter(tag); if (er == null) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/HtmlUtils.java Mon Apr 11 23:42:11 2005 @@ -127,7 +127,7 @@ public static String escapeEscapes(String val) { assert(val != null); - StringBuilder sb = new StringBuilder(val.length()); + StringBuffer sb = new StringBuffer(val.length()); for (int i = 0; i < val.length(); i++) { char c = val.charAt(i); if (c == '"') { @@ -146,7 +146,7 @@ public static String legacyEscapeEscapes(String val) { assert(val != null); - StringBuilder sb = new StringBuilder(val.length()); + StringBuffer sb = new StringBuffer(val.length()); for (int i = 0; i < val.length(); i++) { char c = val.charAt(i); if (c == '"') { @@ -172,7 +172,7 @@ public static String addParams(String url, Map params, String encoding) throws JspException { - StringBuilder urlBuffer = new StringBuilder(url); + StringBuffer urlBuffer = new StringBuffer(url); try { // Add dynamic parameters if requested Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&r1=161024&r2=161025 ============================================================================== --- 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 Mon Apr 11 23:42:11 2005 @@ -483,7 +483,7 @@ // Emit javascript if this anchor needs to sumbit the form or open a popup window if (_formSubmit && formAction != null || idScript != null || _popupSupport != null) { - StringBuilder script = new StringBuilder(32); + StringBuffer script = new StringBuffer(32); StringBuilderRenderAppender scriptWriter = new StringBuilderRenderAppender(script); if (_formSubmit && formAction != null) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Base.java Mon Apr 11 23:42:11 2005 @@ -131,7 +131,7 @@ // evaluate the body, this is called basically so any attributes my be applied. getBufferBody(false); - StringBuilder buf = new StringBuilder(64); + StringBuffer buf = new StringBuffer(64); // calculate the href buf.append(request.getScheme()); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java?view=diff&r1=161024&r2=161025 ============================================================================== --- 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 Mon Apr 11 23:42:11 2005 @@ -400,7 +400,7 @@ //Emit javascript if this button needs to sumbit the form or open a popup window if (idScript != null || _popupSupport != null || buttonDisable || buttonDisableAndSubmit) { ScriptRequestState srs = ScriptRequestState.getScriptRequestState(request); - StringBuilder script = new StringBuilder(32); + StringBuffer script = new StringBuffer(32); StringBuilderRenderAppender scriptWriter = new StringBuilderRenderAppender(script); IScriptReporter sr = getScriptReporter(); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBoxGroup.java Mon Apr 11 23:42:11 2005 @@ -158,7 +158,7 @@ private String[] _match; // The actual values we will match against, calculated in doStartTag(). private Object _dynamicAttrs; // the Object - private StringBuilder _saveBody; + private StringBuffer _saveBody; private static final List _internalNamingChain; private WriteRenderAppender _writer; @@ -395,7 +395,7 @@ DataAccessProviderStack.addDataAccessProvider(this, pageContext); } - _saveBody = new StringBuilder(128); + _saveBody = new StringBuffer(128); // Continue processing this page return EVAL_BODY_BUFFERED; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ConfigurePopup.java Mon Apr 11 23:42:11 2005 @@ -124,7 +124,7 @@ */ public void setToolbar(boolean toolbar) { - _toolbar = toolbar; + _toolbar = Boolean.valueOf(toolbar); } /** @@ -138,7 +138,7 @@ */ public void setLocation(boolean location) { - _location = location; + _location = Boolean.valueOf(location); } /** @@ -152,7 +152,7 @@ */ public void setDirectories(boolean directories) { - _directories = directories; + _directories = Boolean.valueOf(directories); } /** @@ -166,7 +166,7 @@ */ public void setStatus(boolean status) { - _status = status; + _status = Boolean.valueOf(status); } /** @@ -180,7 +180,7 @@ */ public void setMenubar(boolean menubar) { - _menubar = menubar; + _menubar = Boolean.valueOf(menubar); } /** @@ -194,7 +194,7 @@ */ public void setScrollbars(boolean scrollbars) { - _scrollbars = scrollbars; + _scrollbars = Boolean.valueOf(scrollbars); } /** @@ -208,7 +208,7 @@ */ public void setResizable(boolean resizable) { - _resizable = resizable; + _resizable = Boolean.valueOf(resizable); } /** @@ -222,7 +222,7 @@ */ public void setWidth(int width) { - _width = width; + _width = new Integer(width); } /** @@ -236,7 +236,7 @@ */ public void setHeight(int height) { - _height = height; + _height = new Integer(height); } /** @@ -250,7 +250,7 @@ */ public void setLeft(int left) { - _left = left; + _left = new Integer(left); } /** @@ -264,7 +264,7 @@ */ public void setTop(int top) { - _top = top; + _top = new Integer(top); } /** @@ -299,27 +299,27 @@ if (popupSupport != null) { popupSupport.setName(_name); if (_toolbar != null) - popupSupport.setToolbar(_toolbar); + popupSupport.setToolbar(_toolbar.booleanValue()); if (_location != null) - popupSupport.setLocation(_location); + popupSupport.setLocation(_location.booleanValue()); if (_directories != null) - popupSupport.setDirectories(_directories); + popupSupport.setDirectories(_directories.booleanValue()); if (_status != null) - popupSupport.setStatus(_status); + popupSupport.setStatus(_status.booleanValue()); if (_menubar != null) - popupSupport.setMenubar(_menubar); + popupSupport.setMenubar(_menubar.booleanValue()); if (_resizable != null) - popupSupport.setResizable(_resizable); + popupSupport.setResizable(_resizable.booleanValue()); if (_scrollbars != null) - popupSupport.setScrollbars(_scrollbars); + popupSupport.setScrollbars(_scrollbars.booleanValue()); if (_width != null) - popupSupport.setWidth(_width); + popupSupport.setWidth(_width.intValue()); if (_height != null) - popupSupport.setHeight(_height); + popupSupport.setHeight(_height.intValue()); if (_left != null) - popupSupport.setLeft(_left); + popupSupport.setLeft(_left.intValue()); if (_top != null) - popupSupport.setTop(_top); + popupSupport.setTop(_top.intValue()); popupSupport.setReplace(_replace); popupSupport.setPopupFunc(_popupFunc); popupSupport.setOnPopupDone(_onPopupDone); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Error.java Mon Apr 11 23:42:11 2005 @@ -140,7 +140,7 @@ } // Render the error message appropriately - StringBuilder results = new StringBuilder(128); + StringBuffer results = new StringBuffer(128); String message = null; Iterator reports = null; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Errors.java Mon Apr 11 23:42:11 2005 @@ -133,7 +133,7 @@ } // Render the error messages appropriately - StringBuilder results = new StringBuilder(128); + StringBuffer results = new StringBuffer(128); boolean headerDone = false; String message = null; Iterator reports = null; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Exceptions.java Mon Apr 11 23:42:11 2005 @@ -101,7 +101,7 @@ // First look for the exception in the pageflow/struts request attribute. If it's not there, // look for it in the request attribute the container provides for web.xml-configured error // pages. - StringBuilder results = new StringBuilder(128); + StringBuffer results = new StringBuffer(128); PageContext pageContext = getPageContext(); Throwable e = (Throwable) pageContext.getAttribute(Globals.EXCEPTION_KEY, PageContext.REQUEST_SCOPE); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java?view=diff&r1=161024&r2=161025 ============================================================================== --- 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 Mon Apr 11 23:42:11 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.core.urls.MutableURI; -import org.apache.beehive.netui.core.urls.URLRewriter.URLType; +import org.apache.beehive.netui.core.urls.URLType; import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.pageflow.FlowController; import org.apache.beehive.netui.pageflow.PageFlowUtils; @@ -232,7 +232,7 @@ private boolean _formSubmit = false; private Map _params; private String _actionUrl; // The generated action URL. - private LinkedHashMap<String, List<String>> _extraHiddenParams = null; // hidden form fields based on URL parameters + private LinkedHashMap/*<String, List<String>>*/ _extraHiddenParams = null; // hidden form fields based on URL parameters /** * Return the name of the Tag. @@ -659,7 +659,7 @@ // Create the action URL here, so child tags can access it. try { HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); - _extraHiddenParams = new LinkedHashMap<String, List<String>>(); + _extraHiddenParams = new LinkedHashMap/*<String, List<String>>*/(); _actionUrl = rewriteActionURL(servletContext, request, response, _extraHiddenParams); } catch (URISyntaxException e) { @@ -770,8 +770,10 @@ // add the extra hidden parameters if (_extraHiddenParams != null && _extraHiddenParams.size() > 0) { - for (String name : _extraHiddenParams.keySet()) { - for (String value : _extraHiddenParams.get(name)) { + for (Iterator i = _extraHiddenParams.keySet().iterator(); i.hasNext();) { + String name = (String) i.next(); + for (Iterator j = ((List)_extraHiddenParams.get(name)).iterator(); j.hasNext();) { + String value = (String) j.next(); writeHiddenParam(name, value, writer, request, true); } } @@ -856,7 +858,7 @@ * Write a hidden field for a paramter * @param paramName The name of the parameter * @param paramValue The value of the paramter - * @param results The StringBuilder to append the result to + * @param results The StringBuffer to append the result to * @param req THe servlet request */ private void writeHiddenParam(String paramName, String paramValue, AbstractRenderAppender results, @@ -885,7 +887,7 @@ * runs the modified URL through the rewriter service's templated URL formatting. */ private String rewriteActionURL(ServletContext servletContext, HttpServletRequest request, - HttpServletResponse response, LinkedHashMap<String, List<String>> extraHiddenParams) + HttpServletResponse response, LinkedHashMap/*<String, List<String>>*/ extraHiddenParams) throws URISyntaxException { String qualifiedAction = InternalUtils.qualifyAction(servletContext, _state.action); 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&r1=161024&r2=161025 ============================================================================== --- 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 Mon Apr 11 23:42:11 2005 @@ -278,7 +278,7 @@ if (dataToFormat == null) { return null; } - StringBuilder formattedString = new StringBuilder(32); + StringBuffer formattedString = new StringBuffer(32); SimpleDateFormat dateFormat = null; if (getPattern() != null) { 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&r1=161024&r2=161025 ============================================================================== --- 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 Mon Apr 11 23:42:11 2005 @@ -200,7 +200,7 @@ if (dataToFormat == null) { return null; } - StringBuilder formattedString = new StringBuilder(32); + StringBuffer formattedString = new StringBuffer(32); DecimalFormat numberFormat = null; // get the number format. The type has been validated when it was set on the tag. 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&r1=161024&r2=161025 ============================================================================== --- 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 Mon Apr 11 23:42:11 2005 @@ -177,7 +177,7 @@ if (dataToFormat == null) { return null; } - StringBuilder formattedString = new StringBuilder(32); + StringBuffer formattedString = new StringBuffer(32); int index = 0; int patternIndex = 0; String unformattedString = dataToFormat.toString(); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java Mon Apr 11 23:42:11 2005 @@ -159,7 +159,7 @@ nameHtmlControl(_state, ref); if (_value != null) { - StringBuilder sb = new StringBuilder(_value.length() + 16); + StringBuffer sb = new StringBuffer(_value.length() + 16); StringBuilderRenderAppender sbAppend = new StringBuilderRenderAppender(sb); HtmlUtils.filter(_value, sbAppend); _state.value = sb.toString(); 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&r1=161024&r2=161025 ============================================================================== --- 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 Mon Apr 11 23:42:11 2005 @@ -156,7 +156,7 @@ protected String formatText(Object text) throws JspException { - StringBuilder errors = null; + StringBuffer errors = null; if (text == null) return null; @@ -170,7 +170,7 @@ // and continue to the next one. if (currentFormatter.hasError()) { if (errors == null) { - errors = new StringBuilder(32); + errors = new StringBuffer(32); } assert(errors != null); errors.append(currentFormatter.getErrorMessage()); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/PopupSupport.java Mon Apr 11 23:42:11 2005 @@ -30,6 +30,7 @@ import javax.servlet.jsp.JspException; import java.util.HashMap; import java.util.Map; +import java.util.Iterator; class PopupSupport { @@ -85,22 +86,22 @@ public void setWidth(int width) { - putFeature("width", width); + putFeature("width", new Integer(width)); } public void setHeight(int height) { - putFeature("height", height); + putFeature("height", new Integer(height)); } public void setLeft(int left) { - putFeature("left", left); + putFeature("left", new Integer(left)); } public void setTop(int top) { - putFeature("top", top); + putFeature("top", new Integer(top)); } public void setReplace(boolean replace) @@ -121,12 +122,13 @@ public String getOnClick(ServletRequest req, String url) { // Build up the string that's passed to javascript open() to specify window features. - StringBuilder features = new StringBuilder(); + StringBuffer features = new StringBuffer(); if (_features != null) { boolean firstOne = true; - for (Object i : _features.entrySet()) { - Map.Entry entry = (Map.Entry) i; + for (Iterator i = _features.entrySet().iterator(); i.hasNext();) + { + Map.Entry entry = (Map.Entry) i.next(); if (!firstOne) { features.append(','); } @@ -138,7 +140,7 @@ } String popupFunc = (_popupFunc != null ? _popupFunc : getScopedFunctionName(req, POPUP_FUNC)); - Object[] args = new Object[]{popupFunc, url, _name, features.toString(), _replace}; + Object[] args = new Object[]{popupFunc, url, _name, features.toString(), Boolean.valueOf(_replace)}; return ScriptRequestState.getString("popupSupportOnClick", args); } @@ -173,7 +175,7 @@ private void putFeature(String featureName, boolean val) { - putFeature(featureName, val ? 1 : 0); + putFeature(featureName, val ? new Integer(1) : new Integer(0)); } private void putFeature(String featureName, Object val) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RadioButtonGroup.java Mon Apr 11 23:42:11 2005 @@ -156,7 +156,7 @@ private String _match; // The actual values we will match against, calculated in doStartTag(). private String _defaultRadio; // private Object _dynamicAttrs; // The optionsDataSource object - private StringBuilder _saveBody; // The body text + private StringBuffer _saveBody; // The body text private WriteRenderAppender _writer; @@ -305,7 +305,7 @@ } //write(results.toString()); // This is basically this is if enough for 5 options - _saveBody = new StringBuilder(640); + _saveBody = new StringBuffer(640); return EVAL_BODY_INCLUDE; } @@ -365,7 +365,7 @@ if (_cr == null) _cr = TagRenderingBase.Factory.getConstantRendering(req); - //StringBuilder results = new StringBuilder(128); + //StringBuffer results = new StringBuffer(128); if (_saveBody != null) write(_saveBody.toString()); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/RewriteURL.java Mon Apr 11 23:42:11 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.tags.html; import org.apache.beehive.netui.core.urls.FreezableMutableURI; -import org.apache.beehive.netui.core.urls.URLRewriter.URLType; +import org.apache.beehive.netui.core.urls.URLType; import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.pageflow.PageFlowUtils; import org.apache.beehive.netui.tags.AbstractClassicTag;
