Author: ekoneil
Date: Mon Apr 11 09:23:15 2005
New Revision: 160922
URL: http://svn.apache.org/viewcvs?view=rev&rev=160922
Log:
NetUI data grid message i18n and code cleanup.
- pulling strings into constants
- adding i18n'ed messages
more of the same coming...
BB: self
DRT: NetUI pass
BVT: NetUI pass
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java
Mon Apr 11 09:23:15 2005
@@ -22,6 +22,8 @@
import javax.servlet.jsp.JspContext;
import javax.servlet.ServletRequest;
+import org.apache.beehive.netui.util.Bundle;
+
/**
*
*/
@@ -65,16 +67,20 @@
}
public final DataGridState getDataGridState(String name, DataGridConfig
config) {
- DataGridState state = null;
+ if(config == null)
+ throw new
IllegalArgumentException(Bundle.getErrorString("DataGridStateFactory_nullDataGridConfig"));
+
DataGridStateCodec codec = lookupCodec(name, config);
- state = codec.getDataGridState();
+ DataGridState state = codec.getDataGridState();
return state;
}
public final DataGridURLBuilder getDataGridURLBuilder(String name,
DataGridConfig config) {
- DataGridURLBuilder builder = null;
+ if(config == null)
+ throw new
IllegalArgumentException(Bundle.getErrorString("DataGridStateFactory_nullDataGridConfig"));
+
DataGridStateCodec codec = lookupCodec(name, config);
- builder = codec.getDataGridURLBuilder();
+ DataGridURLBuilder builder = codec.getDataGridURLBuilder();
return builder;
}
@@ -88,7 +94,7 @@
if(_cache.containsKey(name))
codec = _cache.get(name);
else {
- assert config != null : "Received a null DataGridConfig; unable to
create a DataGridCodec";
+ assert config != null;
codec = config.createStateCodec(_request, name);
_cache.put(name, codec);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java
Mon Apr 11 09:23:15 2005
@@ -24,6 +24,7 @@
private String _filterExpression;
private FilterOperation _filterOperation;
+ private FilterOperationHint _filterOperationHint;
private Object _value;
private FilterTypeHint _typeHint = FilterTypeHint.getDefault();
@@ -50,6 +51,14 @@
public FilterOperation getOperation() {
return _filterOperation;
+ }
+
+ public FilterOperationHint getOperationHint() {
+ return _filterOperationHint;
+ }
+
+ public void setOperationHint(FilterOperationHint filterOperationHint) {
+ _filterOperationHint = filterOperationHint;
}
public void setValue(Object value) {
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
Mon Apr 11 09:23:15 2005
@@ -17,6 +17,8 @@
*/
package org.apache.beehive.netui.databinding.datagrid.api.pager;
+import org.apache.beehive.netui.util.Bundle;
+
/**
*
*/
@@ -49,7 +51,7 @@
public void setDefaultPageSize(int pageSize) {
if(pageSize < 1)
- throw new IllegalArgumentException("Illegal default page size; the
default page size must be greater than zero.");
+ throw new
IllegalArgumentException(Bundle.getErrorString("PagerModel_IllegalDefaultPageSize"));
_defaultPageSize = new Integer(pageSize);
updatePagerState();
@@ -94,7 +96,7 @@
public void setPageSize(int pageSize) {
if(pageSize < 1)
- throw new IllegalArgumentException("Can not set a page size that
is less than one.");
+ throw new
IllegalArgumentException(Bundle.getErrorString("PagerModel_IllegalPageSize"));
_explicitPageSize = pageSize;
@@ -145,7 +147,7 @@
public int getLastPage() {
if(_lastPage != null)
return _lastPage;
- else throw new IllegalStateException("Unable to calculate the last
page for the pager. The size of the data set is unknown.");
+ else throw new
IllegalStateException(Bundle.getErrorString("PagerModel_CantCalculateLastPage"));
}
private void updatePagerState() {
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
Mon Apr 11 09:23:15 2005
@@ -22,6 +22,7 @@
import org.apache.beehive.netui.tags.html.FormatTag.Formatter;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.Bundle;
/**
*/
@@ -68,9 +69,8 @@
try {
formatted = formatter.format(formatted);
} catch(JspException e) {
- e.printStackTrace();
/* todo: error reporting */
- LOGGER.error("A formatter of type \"" +
formatter.getClass().getName() + "\" threw an exception " + e, e);
+
LOGGER.error(Bundle.getErrorString("CellModel_FormatterThrewException", new
Object[] {formatter.getClass().getName(), e}), e);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
Mon Apr 11 09:23:15 2005
@@ -32,6 +32,7 @@
import org.apache.beehive.netui.databinding.datagrid.runtime.util.PagedDataSet;
import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
+import org.apache.beehive.netui.util.Bundle;
/**
*
@@ -110,7 +111,7 @@
_renderState = RENDER_STATE_END;
break;
default:
- throw new IllegalStateException("Unable to make the specified
render state transition");
+ throw new
IllegalStateException(Bundle.getErrorString("DataGridTagModel_InvalidStateTransition"));
}
return;
@@ -135,7 +136,6 @@
/* todo: would be nice to address this side-effect outside of the setter */
public void setPagerRenderer(PagerRenderer pagerRenderer) {
- assert pagerRenderer != null : "Received a null pager renderer";
_pagerRenderer = pagerRenderer;
_pagerRenderer.setDataGridTagModel(this);
}
@@ -221,14 +221,13 @@
}
}
- /* todo: move to the DataGridConfig object */
public String getDefaultSortImagePath() {
return getMessage(IDataGridMessageKeys.SORT_NONE_IMAGE_PATH);
}
public void renderPager(AbstractRenderAppender appender) {
- assert getPagerRenderer() != null : "Received a null PagerRenderer";
- appender.append(getPagerRenderer().render());
+ if(getPagerRenderer() != null)
+ appender.append(getPagerRenderer().render());
}
public DataGridState getState() {
@@ -239,7 +238,6 @@
return _urlBuilder;
}
- /* todo: these should go away in favor of calling them on the PagedDataSet
*/
public int getCurrentIndex() {
return _dataSet.getCurrentIndex();
}
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=160921&r2=160922
==============================================================================
---
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 09:23:15 2005
@@ -29,6 +29,7 @@
import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.Bundle;
/**
*
@@ -156,11 +157,10 @@
queryParams,
_gridModel.getJspContext());
} catch(URISyntaxException mue) {
-
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {_pagerModel.getPageHref(), _pagerModel.getPageAction()});
if(LOGGER.isErrorEnabled())
- LOGGER.error("Exception creating URL with href " +
_pagerModel.getPageHref() + " action " + _pagerModel.getPageAction(), mue);
-
- throw new CellDecoratorException("An exception occurred creating
an URL while decorating an Anchor", mue);
+ LOGGER.error(message, mue);
+ throw new CellDecoratorException(message, mue);
}
return uri;
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=160921&r2=160922
==============================================================================
---
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 09:23:15 2005
@@ -25,6 +25,8 @@
public abstract class StyleModel {
private static final String DELIM = "-";
+ private static final String SPACE = " ";
+ private static final String EMPTY = "";
private String _stylePrefix = null;
@@ -75,13 +77,13 @@
public String buildStyleClassValue(List<String> styleClasses) {
if(styleClasses == null)
- return "";
+ return EMPTY;
boolean styleWritten = false;
StringBuffer buf = new StringBuffer();
for(int i = 0; i < styleClasses.size(); i++) {
if(styleWritten)
- buf.append(" ");
+ buf.append(SPACE);
if(styleClasses.get(i) != null) {
buf.append(styleClasses.get(i));
@@ -100,7 +102,7 @@
else return baseStyle;
}
- /* @todo: could cache the style names once they've been produced */
+ /* @todo: perf - could cache the style names once they've been produced */
private final String prefix(String style) {
StringBuilder sb = new StringBuilder(16);
sb.append(_stylePrefix);
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=160921&r2=160922
==============================================================================
---
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 09:23:15 2005
@@ -43,9 +43,11 @@
public class DefaultDataGridConfig
extends DataGridConfig {
- private static final String EMPTY_STYLE_POLICY_NAME = "empty";
- private static final String DEFAULT_STYLE_POLICY_NAME = "default";
- private static final StyleModel DEFAULT_STYLE_POLICY = new
DefaultStyleModel("datagrid");
+ private static final String STYLE_POLICY_NAME_EMPTY = "empty";
+ private static final String STYLE_POLICY_NAME_DEFAULT = "default";
+ private static final String STYLE_PREFIX_DEFAULT = "datagrid";
+
+ private static final StyleModel DEFAULT_STYLE_POLICY = new
DefaultStyleModel(STYLE_PREFIX_DEFAULT);
private static final StyleModel EMPTY_STYLE_POLICY = new EmptyStyleModel();
private static final SortStrategy SORT_STRATEGY = new
DefaultSortStrategy();
@@ -97,12 +99,12 @@
}
public StyleModel getStyleModel(String name, String classPrefix) {
- if(name == null || name.equals(DEFAULT_STYLE_POLICY_NAME)) {
+ if(name == null || name.equals(STYLE_POLICY_NAME_DEFAULT)) {
if(classPrefix != null)
return new DefaultStyleModel(classPrefix);
else
return DEFAULT_STYLE_POLICY;
- } else if(name != null && name.equals(EMPTY_STYLE_POLICY_NAME))
+ } else if(name != null && name.equals(STYLE_POLICY_NAME_EMPTY))
return EMPTY_STYLE_POLICY;
else return DEFAULT_STYLE_POLICY;
}
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=160921&r2=160922
==============================================================================
---
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 09:23:15 2005
@@ -35,6 +35,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.DataGridConfig;
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;
/**
*
@@ -256,8 +257,7 @@
try {
intValue = new Integer(value);
} catch(NumberFormatException nfe) {
- if(LOGGER.isErrorEnabled())
- LOGGER.error("Invalid current page value \"" + value + "\".
Cause: " + nfe, nfe);
+
LOGGER.error(Bundle.getErrorString("DataGridStateCodec_IllegalIntegerValue",
new Object[] {value, nfe}));
}
return intValue;
}
@@ -337,23 +337,14 @@
if(terms.length == 2 && terms[1].equals("*"))
continue;
- else if(terms.length == 3) {
- try {
- FilterOperation fOp =
SQLSupport.mapFilterAbbreviationToOperation(terms[1]);
- filter = _config.createFilter();
- filter.setFilterExpression(terms[0]);
- filter.setOperation(fOp);
- filter.setValue(terms[2]);
-
- } catch(NumberFormatException nfe) {
- if(LOGGER.isErrorEnabled())
- LOGGER.error("An error occurred parsing a URL filter
with syntax \"" + filter + "\".");
- continue;
- }
+ else if (terms.length == 3) {
+ FilterOperation fOp =
SQLSupport.mapFilterAbbreviationToOperation(terms[1]);
+ filter = _config.createFilter();
+ filter.setFilterExpression(terms[0]);
+ filter.setOperation(fOp);
+ filter.setValue(terms[2]);
} else {
- String msg = "The syntax of the filter \"" + filter + "\" is
illegal.";
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg);
+
LOGGER.error(Bundle.getErrorString("DataGridStateCodec_IllegalFilter", new
Object[] {filter}));
continue;
}
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=160921&r2=160922
==============================================================================
---
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 09:23:15 2005
@@ -25,6 +25,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortStrategy;
import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
import org.apache.beehive.netui.databinding.datagrid.api.DataGridURLBuilder;
+import org.apache.beehive.netui.util.Bundle;
/**
* A class that is used to expose various URL parameter maps that can be data
bound during JSP rendering.
@@ -237,7 +238,8 @@
currList.add(values[i]);
}
}
- else throw new IllegalStateException("Can not merge values
into the type: " + currValues.getClass().getName());
+ else throw new
IllegalStateException(Bundle.getErrorString("DataGridURLBuilder_UnableToMergeValues",
+ new
Object[] {currValues.getClass().getName()}));
}
else newMap.put(key, values);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
Mon Apr 11 09:23:15 2005
@@ -19,6 +19,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortStrategy;
+import org.apache.beehive.netui.util.Bundle;
/**
*
@@ -40,6 +41,6 @@
return SortDirection.DESCENDING;
else if(direction == SortDirection.DESCENDING)
return SortDirection.NONE;
- else throw new IllegalStateException("Received invalid sort direction
\"" + direction + "\"");
+ else throw new
IllegalStateException(Bundle.getErrorString("SortStrategy_InvalidSortDirection",
new Object[] {direction}));
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
Mon Apr 11 09:23:15 2005
@@ -25,6 +25,16 @@
public class DefaultStyleModel
extends StyleModel {
+ private static final String CLASS_ROW_HEADER = "header";
+ private static final String CLASS_ROW_FOOTER = "footer";
+ private static final String CLASS_ROW_EVEN = "even";
+ private static final String CLASS_ROW_ODD = "odd";
+ private static final String CLASS_CELL_HEADER_SORTABLE = "sortable";
+ private static final String CLASS_CELL_HEADER_SORTED = "sorted";
+ private static final String CLASS_CELL_HEADER_FILTERED = "filtered";
+ private static final String CLASS_CELL_DATA_SORTED = "sorted";
+ private static final String CLASS_CELL_DATA_FILTERED = "filtered";
+
public DefaultStyleModel() {
this(null);
}
@@ -50,19 +60,19 @@
}
public String getHeaderRowClass() {
- return buildStyleClass("header");
+ return buildStyleClass(CLASS_ROW_HEADER);
}
public String getFooterRowClass() {
- return buildStyleClass("footer");
+ return buildStyleClass(CLASS_ROW_FOOTER);
}
public String getRowClass() {
- return buildStyleClass("even");
+ return buildStyleClass(CLASS_ROW_EVEN);
}
public String getAltRowClass() {
- return buildStyleClass("odd");
+ return buildStyleClass(CLASS_ROW_ODD);
}
public String getDataCellClass() {
@@ -74,22 +84,22 @@
}
public String getHeaderCellSortableClass() {
- return buildStyleClass("sortable");
+ return buildStyleClass(CLASS_CELL_HEADER_SORTABLE);
}
public String getHeaderCellSortedClass() {
- return buildStyleClass("sorted");
+ return buildStyleClass(CLASS_CELL_HEADER_SORTED);
}
public String getHeaderCellFilteredClass() {
- return buildStyleClass("filtered");
+ return buildStyleClass(CLASS_CELL_HEADER_FILTERED);
}
public String getDataCellSortedClass() {
- return buildStyleClass("sorted");
+ return buildStyleClass(CLASS_CELL_DATA_SORTED);
}
public String getDataCellFilteredClass() {
- return buildStyleClass("filtered");
+ return buildStyleClass(CLASS_CELL_DATA_FILTERED);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
Mon Apr 11 09:23:15 2005
@@ -33,6 +33,7 @@
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
import org.apache.beehive.netui.tags.databinding.datagrid.DataGridUtil;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.Bundle;
/**
*
@@ -42,7 +43,6 @@
private static final Logger LOGGER =
Logger.getInstance(AnchorCellDecorator.class);
- /* todo: need to tie this into the grid's error reporting */
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel columnModel)
throws CellDecoratorException {
@@ -65,12 +65,10 @@
anchorCellModel.getScopeId(),
anchorCellModel.getParams(),
jspContext);
- } catch(URISyntaxException mue) {
-
- if(LOGGER.isErrorEnabled())
- LOGGER.error("Exception creating URL with href " +
anchorCellModel.getHref() + " action " + anchorCellModel.getAction(), mue);
-
- throw new CellDecoratorException("An exception occurred creating
an URL while decorating an Anchor", mue);
+ } catch(URISyntaxException use) {
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {anchorCellModel.getHref(), anchorCellModel.getAction()});
+ LOGGER.error(message, use);
+ throw new CellDecoratorException(message, use);
}
anchorState.href = url;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
Mon Apr 11 09:23:15 2005
@@ -33,6 +33,7 @@
import
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.ImageAnchorCellModel;
import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.Bundle;
/**
*/
@@ -64,13 +65,11 @@
imageAnchorCellModel.getScopeId(),
imageAnchorCellModel.getParams(),
jspContext);
- } catch(URISyntaxException mue) {
-
+ } catch(URISyntaxException use) {
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {imageAnchorCellModel.getHref(),
imageAnchorCellModel.getAction()});
if(LOGGER.isErrorEnabled())
- LOGGER.error("Exception creating URL with href " +
imageAnchorCellModel.getHref() +
- " action " + imageAnchorCellModel.getAction(), mue);
-
- throw new CellDecoratorException("An exception occurred creating
an URL while decorating an Anchor", mue);
+ LOGGER.error(message, use);
+ throw new CellDecoratorException(message, use);
}
anchorState.href = url;
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=160921&r2=160922
==============================================================================
---
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 09:23:15 2005
@@ -38,6 +38,7 @@
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.html.HtmlConstants;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.Bundle;
/**
*
@@ -103,13 +104,11 @@
cellModel.getScopeId(),
queryParams,
dgm.getJspContext());
- } catch(URISyntaxException se) {
- String msg = "Exception creating sort URI";
-
+ } catch(URISyntaxException use) {
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {cellModel.getSortHref(), cellModel.getSortAction()});
if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, se);
-
- throw new CellDecoratorException(msg, se);
+ LOGGER.error(message, use);
+ throw new CellDecoratorException(message, use);
}
aTag.href = href;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java
Mon Apr 11 09:23:15 2005
@@ -35,6 +35,8 @@
*/
public final class TableRenderer {
+ private static final String LINE_BREAK = "\n";
+
private static final TableTag.State TABLE_STATE = new TableTag.State();
private static final CaptionTag.State CAPTION_STATE = new
CaptionTag.State();
private static final THeadTag.State THEAD_STATE = new THeadTag.State();
@@ -76,22 +78,22 @@
if(state == null)
state = TABLE_STATE;
- appender.append("\n");
+ appender.append(LINE_BREAK);
_tableRenderer.doStartTag(appender, state);
- appender.append("\n");
+ appender.append(LINE_BREAK);
}
public void closeTable(AbstractRenderAppender appender) {
_tableRenderer.doEndTag(appender);
- appender.append("\n");
- appender.append("\n");
+ appender.append(LINE_BREAK);
+ appender.append(LINE_BREAK);
}
public void openCaption(CaptionTag.State state, AbstractRenderAppender
appender) {
if(state == null)
state = CAPTION_STATE;
- appender.append("\n");
+ appender.append(LINE_BREAK);
if(_captionRenderer == null)
_captionRenderer =
TagRenderingBase.Factory.getRendering(TagRenderingBase.CAPTION_TAG, _request);
@@ -100,11 +102,10 @@
}
public void closeCaption(AbstractRenderAppender appender) {
- if(_captionRenderer == null)
- throw new IllegalStateException("Encountered a null THeadTag
renderer. Was openCaption called?");
+ assert _captionRenderer != null : "Encountered a null THeadTag
renderer. Was openCaption called?";
_captionRenderer.doEndTag(appender);
- appender.append("\n");
+ appender.append(LINE_BREAK);
}
/* -------------------------------------------------------------
@@ -120,17 +121,16 @@
if(_theadRenderer == null)
_theadRenderer =
TagRenderingBase.Factory.getRendering(TagRenderingBase.THEAD_TAG, _request);
- appender.append("\n");
+ appender.append(LINE_BREAK);
_theadRenderer.doStartTag(appender, state);
}
public void closeTableHead(AbstractRenderAppender appender) {
- if(_theadRenderer == null)
- throw new IllegalStateException("Encountered a null THeadTag
renderer. Was openTableHead called?");
+ assert _theadRenderer != null : "Encountered a null THeadTag renderer.
Was openTableHead called?";
- appender.append("\n");
+ appender.append(LINE_BREAK);
_theadRenderer.doEndTag(appender);
- appender.append("\n");
+ appender.append(LINE_BREAK);
}
public void openTableBody(TBodyTag.State state, AbstractRenderAppender
appender) {
@@ -140,15 +140,14 @@
if(_tbodyRenderer == null)
_tbodyRenderer =
TagRenderingBase.Factory.getRendering(TagRenderingBase.TBODY_TAG, _request);
- appender.append("\n");
+ appender.append(LINE_BREAK);
_tbodyRenderer.doStartTag(appender, state);
}
public void closeTableBody(AbstractRenderAppender appender) {
- if(_tbodyRenderer == null)
- throw new IllegalStateException("Encountered a null TBodyTag
renderer. Was openTableBody called?");
+ assert _tbodyRenderer != null : "Encountered a null TBodyTag renderer.
Was openTableBody called?";
- appender.append("\n");
+ appender.append(LINE_BREAK);
_tbodyRenderer.doEndTag(appender);
}
@@ -159,18 +158,17 @@
if(_tfootRenderer == null)
_tfootRenderer =
TagRenderingBase.Factory.getRendering(TagRenderingBase.TFOOT_TAG, _request);
- appender.append("\n");
+ appender.append(LINE_BREAK);
_tfootRenderer.doStartTag(appender, state);
- appender.append("\n");
+ appender.append(LINE_BREAK);
}
public void closeTableFoot(AbstractRenderAppender appender) {
- if(_tfootRenderer == null)
- throw new IllegalStateException("Encountered a null TFootTag
renderer. Was openTableFoot called?");
+ assert _tfootRenderer != null : "Encountered a null TFootTag renderer.
Was openTableFoot called?";
- appender.append("\n");
+ appender.append(LINE_BREAK);
_tfootRenderer.doEndTag(appender);
- appender.append("\n");
+ appender.append(LINE_BREAK);
}
@@ -184,22 +182,22 @@
if(state == null)
state = TR_STATE;
- appender.append("\n");
+ appender.append(LINE_BREAK);
_trRenderer.doStartTag(appender, state);
}
public void closeHeaderRow(AbstractRenderAppender appender) {
- appender.append("\n");
+ appender.append(LINE_BREAK);
_trRenderer.doEndTag(appender);
}
public void openTableRow(TrTag.State state, AbstractRenderAppender
appender) {
- appender.append("\n");
+ appender.append(LINE_BREAK);
_trRenderer.doStartTag(appender, state);
}
public void closeTableRow(AbstractRenderAppender appender) {
- appender.append("\n");
+ appender.append(LINE_BREAK);
_trRenderer.doEndTag(appender);
}
@@ -207,12 +205,12 @@
if(state == null)
state = TR_STATE;
- appender.append("\n");
+ appender.append(LINE_BREAK);
_trRenderer.doStartTag(appender, state);
}
public void closeFooterRow(AbstractRenderAppender appender) {
- appender.append("\n");
+ appender.append(LINE_BREAK);
_trRenderer.doEndTag(appender);
}
@@ -228,7 +226,7 @@
public void closeHeaderCell(AbstractRenderAppender appender) {
_thRenderer.doEndTag(appender);
- appender.append("\n");
+ appender.append(LINE_BREAK);
}
public void openTableCell(TdTag.State state, AbstractRenderAppender
appender) {
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java
Mon Apr 11 09:23:15 2005
@@ -19,6 +19,7 @@
import
org.apache.beehive.netui.databinding.datagrid.api.exceptions.DataGridExtensionException;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.Bundle;
/**
*
@@ -38,7 +39,7 @@
*/
public static final Object instantiateClass(String className, Class
assignableFrom) {
if(className == null)
- throw new IllegalArgumentException("Can not create an instance of
a null class");
+ throw new
IllegalArgumentException(Bundle.getErrorString("DataGridUtil_CantCreateClass"));
Class clazz = null;
try {
@@ -49,9 +50,8 @@
e instanceof InstantiationException ||
e instanceof ClassNotFoundException : "Caught exception of
unexpected type: " + e.getClass().getName();
- String msg = "Unable to extend data grid. Can't instantiate
extension class. Cause: " + e.getMessage();
+ String msg =
Bundle.getErrorString("DataGridUtil_CantInstantiateClass", new Object[] {e});
LOGGER.error(msg, e);
-
throw new DataGridExtensionException(msg, e);
}
@@ -66,16 +66,15 @@
* @throws
org.apache.beehive.netui.databinding.datagrid.api.exceptions.DataGridExtensionException
when an error occurs creating an instance of the class
*/
public static final Object instantiateClass(Class clazz, Class
assignableFrom) {
-
if(clazz == null)
- throw new IllegalArgumentException("Can not create an instance of
a null class");
+ throw new
IllegalArgumentException(Bundle.getErrorString("DataGridUtil_CantCreateClass"));
try {
Object obj = clazz.newInstance();
if(assignableFrom == null ||
assignableFrom.isAssignableFrom(clazz))
return obj;
- else throw new DataGridExtensionException("Invalid data grid
extension. The class \"" + clazz.getName() + "\" is not a subclass or sub
interface of \"" + assignableFrom + "\"");
+ else throw new
DataGridExtensionException(Bundle.getErrorString("DataGridUtil_InvalidParentClass",
new Object[] {clazz.getName(), assignableFrom}));
}
catch(Exception e) {
assert
@@ -84,10 +83,8 @@
e instanceof InstantiationException ||
e instanceof ClassNotFoundException : "Caught exception of
unexpected type " + e.getClass().getName();
- String msg = "Unable to extend data grid. Can't instantiate
extension class. Cause: " + e.getMessage();
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, e);
-
+ String msg =
Bundle.getErrorString("DataGridUtil_CantInstantiateClass", new Object[] {e});
+ LOGGER.error(msg, e);
throw new DataGridExtensionException(msg, e);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
Mon Apr 11 09:23:15 2005
@@ -30,6 +30,7 @@
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
+import org.apache.beehive.netui.util.Bundle;
public final class JspUtil {
@@ -44,8 +45,7 @@
public static final PageContext getPageContext(JspContext jspContext) {
if(!(jspContext instanceof PageContext))
- throw new IllegalStateException("Can not create a PageContext from
a JspContext of type: " +
- (jspContext != null ? jspContext.getClass().getName() :
"null"));
+ throw new
IllegalStateException(Bundle.getErrorString("DataGridUtil_IllegalJspContext",
new Object[] {(jspContext != null ? jspContext.getClass().getName() :
"null")}));
else return (PageContext)jspContext;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
Mon Apr 11 09:23:15 2005
@@ -51,15 +51,13 @@
else
_dataSetIterator = iterator;
- if(LOGGER.isDebugEnabled())
- LOGGER.debug("iterator type: " +
_dataSetIterator.getClass().getName());
+ LOGGER.debug("iterator type: " +
_dataSetIterator.getClass().getName());
_list = new ArrayList();
while(_dataSetIterator.hasNext()) {
_list.add(_dataSetIterator.next());
_dataSetSize++;
- if(LOGGER.isDebugEnabled())
- LOGGER.debug("dataSetSize: " + _dataSetSize);
+ LOGGER.debug("dataSetSize: " + _dataSetSize);
}
_dataSetIterator = _list.iterator();
}
@@ -79,9 +77,8 @@
}
_advancedToPage = true;
} else if(_endWindow > -1 && (_currentIndex >= _endWindow)) {
- if(LOGGER.isDebugEnabled())
LOGGER.debug("current index: " + _currentIndex + "
_endRenderWindiw: " +
- _endWindow + " end data set: " + (_currentIndex >=
_endWindow));
+ _endWindow + " end data set: " + (_currentIndex
>= _endWindow));
return false;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
Mon Apr 11 09:23:15 2005
@@ -31,6 +31,7 @@
import
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
import org.apache.beehive.netui.databinding.datagrid.api.rendering.StyleModel;
import
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
+import org.apache.beehive.netui.util.Bundle;
/**
* @jsptagref.tagdescription Renders a caption into a data grid
@@ -225,7 +226,7 @@
* @jsptagref.attributedescription The title.
* @jsptagref.databindable false
* @jsptagref.attributesyntaxvalue <i>string_title</i>
- * @netui:attribute required="false" rtexprvalue="true" description="The
title. "
+ * @netui:attribute required="false" rtexprvalue="true" description="The
title."
* @netui.tldx:attribute category="misc"
*/
public void setTitle(String title) {
@@ -237,7 +238,7 @@
DataGridTagModel dgm =
DataGridUtil.getDataGridTagModel(getJspContext());
if(dgm == null)
- throw new JspException("Unable to find a dataGridModel in the
JspContext");
+ throw new
JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel"));
if(dgm.getRenderState() == DataGridTagModel.RENDER_STATE_CAPTION) {
JspFragment fragment = getJspBody();
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=160921&r2=160922
==============================================================================
---
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 09:23:15 2005
@@ -41,8 +41,8 @@
extends AbstractSimpleTag {
private static final Logger LOGGER =
Logger.getInstance(ConfigurePager.class);
- private static final String FIRST_LAST_PREV_NEXT = "firstPrevNextLast";
- private static final String PREV_NEXT = "prevNext";
+ private static final String PAGER_FORMAT_FIRST_LAST_PREV_NEXT =
"firstPrevNextLast";
+ private static final String PAGER_FORMAT_PREV_NEXT = "prevNext";
private boolean _disableDefaultPager = false;
private Integer _pageSize = null;
@@ -157,9 +157,9 @@
}
}
else if(_pagerFormat != null) {
- if(_pagerFormat.equals(FIRST_LAST_PREV_NEXT))
+ if(_pagerFormat.equals(PAGER_FORMAT_FIRST_LAST_PREV_NEXT))
pagerRenderer = new FirstPreviousNextLastPagerRenderer();
- else if(_pagerFormat.equals(PREV_NEXT))
+ else if(_pagerFormat.equals(PAGER_FORMAT_PREV_NEXT))
pagerRenderer = new PreviousNextPagerRenderer();
else throw new JspException("The pagerFormat \"" + _pagerFormat +
"\" is not supported");
}
@@ -171,8 +171,7 @@
throw new JspException("The configurePager tag can't set both the
pageAction and pageHref attributes");
if(_pageHref == null && _pageAction == null) {
- if(LOGGER.isInfoEnabled())
- LOGGER.info("The configurePager tag has no page action or HREF
specified; using the current request URI instead.");
+ LOGGER.info("The configurePager tag has no page action or HREF
specified; using the current request URI instead.");
_pageHref =
((HttpServletRequest)JspUtil.getRequest(getJspContext())).getRequestURI();
}
@@ -181,8 +180,6 @@
if(_pageAction != null)
pm.setPageAction(_pageAction);
-
- return;
}
}
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties?view=diff&r1=160921&r2=160922
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
Mon Apr 11 09:23:15 2005
@@ -644,7 +644,27 @@
Tags_RepeaterComponent_invalidParent=A tag of type \"{0}\" must be nested
within a tag of type \"{1}\"
#
-# NetUI Utility Strings
+# Data Grid Strings
+#
+DataGridStateFactory_nullDataGridConfig=Unable to create a DataGridCodec with
a null DataGridConfig
+PagerModel_IllegalDefaultPageSize=Illegal default page size; the default page
size must be greater than zero.
+PagerModel_IllegalPageSize=Can not set a page size that is less than one.
+PagerModel_CantCalculateLastPage=Unable to calculate the last page for the
pager. The size of the data set is unknown.
+CellModel_FormatterThrewException=A formatter of type \"{0}\" threw an
exception {1}
+DataGridTagModel_InvalidStateTransition=Unable to make the specified render
state transition
+Rendering_URLException=Exception creating URL with href {0} and action {1}
+DataGridStateCodec_IllegalIntegerValue=Invalid integer value \"{0}\". Cause:
{1}
+DataGridStateCodec_IllegalFilter=The syntax of the filter \"{0}\" is illegal.
+DataGridURLBuilder_UnableToMergeValues=Can not merge values into the type: {0}
+SortStrategy_InvalidSortDirection=Found invalid sort direction \"{0}\"
+DataGridUtil_CantCreateClass=Can not create an instance of a null class
+DataGridUtil_CantInstantiateClass=Unable to extend data grid. Can't
instantiate extension class. Cause: {0}
+DataGridUtil_InvalidParentClass=Invalid data grid extension. The class
\"{0}\" is not a subclass or sub interface of \"{1}\"
+DataGridUtil_IllegalJspContext=Can not create a PageContext from a JspContext
of type: {0}
+DataGridTags_MissingDataGridModel=Unable to find a dataGridModel in the
JspContext
+
+#
+# Utility Strings
#
ArrayIterator_notAnArray=Can not create an array iterator from an object that
is not an array
ArrayIteator_arrayError=An error occurred while getting the next element from
an array of type {0}
