Author: ekoneil
Date: Tue Mar 15 08:53:37 2005
New Revision: 157560
URL: http://svn.apache.org/viewcvs?view=rev&rev=157560
Log:
Package protect the implementation classes for the default data grid
configuration.
These are now creatable only by the DefaultDataGridConfig class.
BB: self
DRT: NetUI pass
BVT: NetUI pass
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
- copied, changed from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
(with props)
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
- copied, changed from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridStateCodec.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
- copied, changed from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridURLBuilder.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
- copied, changed from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultSortStrategy.java
Removed:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridStateCodec.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridURLBuilder.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultSortStrategy.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfigFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridResourceProvider.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/filter/FilterModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfigFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfigFactory.java?view=diff&r1=157559&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfigFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfigFactory.java
Tue Mar 15 08:53:37 2005
@@ -17,8 +17,7 @@
*/
package org.apache.beehive.netui.databinding.datagrid.api;
-import
org.apache.beehive.netui.databinding.datagrid.runtime.DefaultDataGridConfig;
-
+import
org.apache.beehive.netui.databinding.datagrid.runtime.config.DefaultDataGridConfig;
/**
*
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridResourceProvider.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridResourceProvider.java?view=diff&r1=157559&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridResourceProvider.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridResourceProvider.java
Tue Mar 15 08:53:37 2005
@@ -17,29 +17,23 @@
*/
package org.apache.beehive.netui.databinding.datagrid.api;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
import java.util.Locale;
-import java.util.HashMap;
-import java.util.Enumeration;
+import java.util.ResourceBundle;
+import java.text.MessageFormat;
/**
*
*/
-public class DataGridResourceProvider {
-
- /* todo: compost this into a DefaultDGRS class */
- private static final Object VALUE_PLACEHOLDER = new Object();
- private static final String DEFAULT_RESOURCE_BUNDLE =
"org.apache.beehive.netui.databinding.datagrid.runtime.util.data-grid-default";
+public abstract class DataGridResourceProvider {
private boolean _enableChaining = false;
private String _resourceBundlePath = null;
-
- private ResourceBundle _defaultResourceBundle = null;
- private ResourceBundle _resourceBundle = null;
- private HashMap _resourceBundleKeys = null;
private Locale _locale = null;
+ public abstract String getMessage(String key);
+
+ public abstract String formatMessage(String key, Object[] args);
+
public boolean isEnableChaining() {
return _enableChaining;
}
@@ -64,54 +58,14 @@
return _resourceBundlePath;
}
- public String getMessage(String key) {
- assert key != null;
-
- return internalGetMessage(key);
- }
-
- public String formatMessage(String key, Object[] args) {
- assert key != null;
-
- String msg = internalFormatMessage(getMessage(key), args);
- return msg;
- }
-
- private final String internalGetMessage(String key) {
- if(_resourceBundlePath == null)
- return getDefaultMessage(key);
- else {
- /* ensure that the correct resource bundles are created */
- if(_resourceBundle == null) {
- _resourceBundle = createResourceBundle(_resourceBundlePath);
- }
-
- if(_enableChaining && _resourceBundleKeys == null) {
- Enumeration e = _resourceBundle.getKeys();
- while(e.hasMoreElements())
- _resourceBundleKeys.put(e.nextElement(),
VALUE_PLACEHOLDER);
- }
-
- if(!_enableChaining || _resourceBundleKeys.containsKey(key))
- return _resourceBundle.getString(key);
- else return _defaultResourceBundle.getString(key);
- }
+ protected ResourceBundle createResourceBundle(String path) {
+ ResourceBundle rb = ResourceBundle.getBundle(path, getLocale(),
Thread.currentThread().getContextClassLoader());
+ return rb;
}
protected String internalFormatMessage(String pattern, Object[] args) {
MessageFormat format = new MessageFormat(pattern);
String msg = format.format(args).toString();
return msg;
- }
-
- private String getDefaultMessage(String key) {
- if(_defaultResourceBundle == null)
- _defaultResourceBundle =
createResourceBundle(DEFAULT_RESOURCE_BUNDLE);
- return _defaultResourceBundle.getString(key);
- }
-
- private ResourceBundle createResourceBundle(String path) {
- ResourceBundle rb = ResourceBundle.getBundle(path, _locale,
Thread.currentThread().getContextClassLoader());
- return rb;
}
}
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=157559&r2=157560
==============================================================================
---
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
Tue Mar 15 08:53:37 2005
@@ -28,9 +28,6 @@
private FilterTypeHint _typeHint = FilterTypeHint.getDefault();
- public Filter() {
- }
-
public FilterTypeHint getTypeHint() {
return _typeHint;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java?view=diff&r1=157559&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
Tue Mar 15 08:53:37 2005
@@ -56,7 +56,7 @@
assert filterExpression != null;
assert !filterExpression.equals("");
- /* todo: perf. need to do this with FilterModelArrayList */
+ /* todo: perf. caching or abstraction to make this faster */
ArrayList<Filter> filters = new ArrayList<Filter>();
for(Filter filter : _filters) {
if(filter.getFilterExpression().equals(filterExpression))
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java?view=diff&r1=157559&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java
Tue Mar 15 08:53:37 2005
@@ -17,8 +17,6 @@
*/
package org.apache.beehive.netui.databinding.datagrid.api.sort;
-import
org.apache.beehive.netui.databinding.datagrid.runtime.DefaultSortStrategy;
-
/**
*
*/
@@ -26,7 +24,6 @@
private String _sortExpression;
private SortDirection _sortDirection;
- private SortStrategy _sortStrategy;
public Sort() {
}
@@ -42,8 +39,6 @@
}
public void setSortExpression(String expression) {
- assert expression != null;
-
_sortExpression = expression;
}
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=157559&r2=157560
==============================================================================
---
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
Tue Mar 15 08:53:37 2005
@@ -49,7 +49,7 @@
if(sortExpression == null)
return false;
- /* optimize for the case where the sortExpression *is* the primary
sort */
+ /* optimizing for the case where the sortExpression *is* the primary
sort */
if(_sorts != null &&
_sorts.size() > 0 &&
_sorts.get(0).getSortExpression().equals(sortExpression)) {
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
(from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/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&rev=157560&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridConfig.java&r1=157431&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
Tue Mar 15 08:53:37 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.runtime;
+package org.apache.beehive.netui.databinding.datagrid.runtime.config;
import java.util.List;
@@ -48,14 +48,13 @@
private static final StyleModel DEFAULT_STYLE_POLICY = new
DefaultStyleModel("datagrid");
private static final StyleModel EMPTY_STYLE_POLICY = new EmptyStyleModel();
private static final SortStrategy SORT_STRATEGY = new
DefaultSortStrategy();
-
+
public DataGridState createDataGridState() {
return new DataGridState();
}
public Sort createSort() {
- Sort sort = new Sort();
- return sort;
+ return new Sort();
}
public Filter createFilter() {
@@ -88,11 +87,11 @@
}
public DataGridResourceProvider getDefaultResourceProvider() {
- return new DataGridResourceProvider();
+ return new DefaultDataGridResourceProvider();
}
public DataGridResourceProvider getResourceProvider(String resourceBundle)
{
- DataGridResourceProvider resourceProvider = new
DataGridResourceProvider();
+ DataGridResourceProvider resourceProvider = new
DefaultDataGridResourceProvider();
resourceProvider.setResourceBundlePath(resourceBundle);
return resourceProvider;
}
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java?view=auto&rev=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
(added)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
Tue Mar 15 08:53:37 2005
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.databinding.datagrid.runtime.config;
+
+import java.util.ResourceBundle;
+import java.util.HashMap;
+import java.util.Enumeration;
+import java.text.MessageFormat;
+
+import
org.apache.beehive.netui.databinding.datagrid.api.DataGridResourceProvider;
+
+/**
+ *
+ */
+class DefaultDataGridResourceProvider
+ extends DataGridResourceProvider {
+
+ private static final Object VALUE_PLACEHOLDER = new Object();
+ private static final String DEFAULT_RESOURCE_BUNDLE =
"org.apache.beehive.netui.databinding.datagrid.runtime.util.data-grid-default";
+
+ private ResourceBundle _defaultResourceBundle = null;
+ private ResourceBundle _resourceBundle = null;
+ private HashMap _resourceBundleKeys = null;
+
+ DefaultDataGridResourceProvider() {
+ }
+
+ public String getMessage(String key) {
+ assert key != null;
+
+ return internalGetMessage(key);
+ }
+
+ public String formatMessage(String key, Object[] args) {
+ assert key != null;
+
+ String msg = internalFormatMessage(getMessage(key), args);
+ return msg;
+ }
+
+ private final String internalGetMessage(String key) {
+ if(getResourceBundlePath() == null)
+ return getDefaultMessage(key);
+ else {
+ /* ensure that the correct resource bundles are created */
+ if(_resourceBundle == null) {
+ _resourceBundle =
createResourceBundle(getResourceBundlePath());
+ }
+
+ if(isEnableChaining() && _resourceBundleKeys == null) {
+ Enumeration e = _resourceBundle.getKeys();
+ while(e.hasMoreElements())
+ _resourceBundleKeys.put(e.nextElement(),
VALUE_PLACEHOLDER);
+ }
+
+ if(!isEnableChaining() || _resourceBundleKeys.containsKey(key))
+ return _resourceBundle.getString(key);
+ else return _defaultResourceBundle.getString(key);
+ }
+ }
+
+ private String getDefaultMessage(String key) {
+ if(_defaultResourceBundle == null)
+ _defaultResourceBundle =
createResourceBundle(DEFAULT_RESOURCE_BUNDLE);
+ return _defaultResourceBundle.getString(key);
+ }
+
+}
Propchange:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
(from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/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&rev=157560&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridStateCodec.java&r1=157431&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridStateCodec.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
Tue Mar 15 08:53:37 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.runtime;
+package org.apache.beehive.netui.databinding.datagrid.runtime.config;
import java.util.*;
@@ -74,7 +74,7 @@
private DataGridState _state = null;
private DefaultDataGridURLBuilder _urlBuilder = null;
- public DefaultDataGridStateCodec(DataGridConfig config) {
+ DefaultDataGridStateCodec(DataGridConfig config) {
_state = new DataGridState();
_urlBuilder = new DefaultDataGridURLBuilder(getGridName(), this,
_state);
_config = config;
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
(from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/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&rev=157560&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridURLBuilder.java&r1=157431&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridURLBuilder.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
Tue Mar 15 08:53:37 2005
@@ -15,13 +15,12 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.runtime;
+package org.apache.beehive.netui.databinding.datagrid.runtime.config;
import java.util.*;
import org.apache.beehive.netui.databinding.datagrid.api.DataGridState;
import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
-import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortStrategy;
import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
@@ -34,14 +33,14 @@
* of this would be a pager URL that will move a UI to the "next" page of
data. The URL parameters would be
* computed using this class and rendered to the UI so that it is clickable
for the next HTTP submit.
*/
-public class DefaultDataGridURLBuilder
+class DefaultDataGridURLBuilder
extends DataGridURLBuilder {
private String _namespace;
private DefaultDataGridStateCodec _codec;
private DataGridState _state;
- public DefaultDataGridURLBuilder(String namespace,
DefaultDataGridStateCodec codec, DataGridState state) {
+ DefaultDataGridURLBuilder(String namespace, DefaultDataGridStateCodec
codec, DataGridState state) {
_namespace = namespace;
_codec = codec;
_state = state;
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
(from r157431,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/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&rev=157560&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultSortStrategy.java&r1=157431&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultSortStrategy.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
Tue Mar 15 08:53:37 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.runtime;
+package org.apache.beehive.netui.databinding.datagrid.runtime.config;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortStrategy;
@@ -23,9 +23,12 @@
/**
*
*/
-public class DefaultSortStrategy
+class DefaultSortStrategy
extends SortStrategy {
+ DefaultSortStrategy() {
+ }
+
public SortDirection getDefaultDirection() {
return SortDirection.ASCENDING;
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java?view=diff&r1=157559&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
Tue Mar 15 08:53:37 2005
@@ -29,7 +29,6 @@
import
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
import org.apache.beehive.netui.databinding.datagrid.api.*;
import org.apache.beehive.netui.databinding.datagrid.runtime.util.PagedDataSet;
-import
org.apache.beehive.netui.databinding.datagrid.runtime.DefaultDataGridConfig;
import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler;
/**
@@ -99,7 +98,6 @@
dgm.setDataSet(dataSet);
dgm.setResourceProvider(provider);
dgm.getState().getPagerModel().setPageAction("fauxPageAction.do");
-
return dgm;
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java?view=diff&r1=157559&r2=157560
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java
Tue Mar 15 08:53:37 2005
@@ -24,7 +24,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
import org.apache.beehive.netui.databinding.datagrid.api.DataGridConfig;
-import
org.apache.beehive.netui.databinding.datagrid.runtime.DefaultDataGridConfig;
+import
org.apache.beehive.netui.databinding.datagrid.runtime.config.DefaultDataGridConfig;
/**
*
