Skip to content

Commit

Permalink
Fix generic issue GeoServerDataProvider
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsCharlier committed Jan 22, 2016
1 parent c809265 commit 347fae0
Showing 1 changed file with 13 additions and 8 deletions.
Expand Up @@ -42,8 +42,9 @@
* *
* @param <T> * @param <T>
*/ */
@SuppressWarnings("serial")
public abstract class GeoServerDataProvider<T> extends SortableDataProvider<T, Object> { public abstract class GeoServerDataProvider<T> extends SortableDataProvider<T, Object> {
private static final long serialVersionUID = -6876929036365601443L;

static final Logger LOGGER = Logging.getLogger(GeoServerDataProvider.class); static final Logger LOGGER = Logging.getLogger(GeoServerDataProvider.class);


/** /**
Expand Down Expand Up @@ -387,8 +388,9 @@ protected Filter getFilter() {
* @param object * @param object
* @return * @return
*/ */
@SuppressWarnings("unchecked")
protected IModel<T> newModel(T object) { protected IModel<T> newModel(T object) {
return new Model((Serializable) object); return (IModel<T>) new Model<Serializable>((Serializable) object);
} }


/** /**
Expand Down Expand Up @@ -444,6 +446,7 @@ public interface Property<T> extends Serializable {
* the getModel() method * the getModel() method
*/ */
public abstract static class AbstractProperty<T> implements Property<T> { public abstract static class AbstractProperty<T> implements Property<T> {
private static final long serialVersionUID = 6286992721731224988L;
String name; String name;
boolean visible; boolean visible;


Expand All @@ -465,13 +468,12 @@ public Comparator<T> getComparator() {
* not suitable for editable tables, if you need to make one you'll have to * not suitable for editable tables, if you need to make one you'll have to
* roll your own getModel() implementation ( {@link BeanProperty} provides a good example) * roll your own getModel() implementation ( {@link BeanProperty} provides a good example)
*/ */
@SuppressWarnings("unchecked") public IModel<?> getModel(IModel<T> itemModel) {
public IModel<T> getModel(IModel<T> itemModel) {
Object value = getPropertyValue((T) itemModel.getObject()); Object value = getPropertyValue((T) itemModel.getObject());
if(value instanceof IModel) { if(value instanceof IModel) {
return (IModel<T>) value; return (IModel<?>) value;
} else { } else {
return new Model((Serializable) value); return new Model<Serializable>((Serializable) value);
} }
} }


Expand Down Expand Up @@ -501,6 +503,7 @@ public boolean isSearchable() {
* @param <T> * @param <T>
*/ */
public static class BeanProperty<T> extends AbstractProperty<T> { public static class BeanProperty<T> extends AbstractProperty<T> {
private static final long serialVersionUID = 5532661316457341748L;
String propertyPath; String propertyPath;


public BeanProperty(String key, String propertyPath) { public BeanProperty(String key, String propertyPath) {
Expand Down Expand Up @@ -556,6 +559,7 @@ public String toString() {
* @param <T> * @param <T>
*/ */
public static class PropertyPlaceholder<T> implements Property<T> { public static class PropertyPlaceholder<T> implements Property<T> {
private static final long serialVersionUID = -6605207892648199453L;
String name; String name;


public PropertyPlaceholder(String name) { public PropertyPlaceholder(String name) {
Expand Down Expand Up @@ -607,9 +611,10 @@ public PropertyComparator(Property<T> property) {
this.property = property; this.property = property;
} }


@SuppressWarnings("unchecked")
public int compare(T o1, T o2) { public int compare(T o1, T o2) {
Comparable p1 = (Comparable) property.getPropertyValue(o1); Comparable<Object> p1 = (Comparable<Object>) property.getPropertyValue(o1);
Comparable p2 = (Comparable) property.getPropertyValue(o2); Comparable<Object> p2 = (Comparable<Object>) property.getPropertyValue(o2);


// what if any property is null? We assume null < (not null) // what if any property is null? We assume null < (not null)
if (p1 == null) if (p1 == null)
Expand Down

0 comments on commit 347fae0

Please sign in to comment.