fixed bug with static initialization of supportedFilters for competitors filters

This commit is contained in:
fmittag committed 2013-04-26 20:27:30 +02:00
1 parent 68c31a733c
commit e6dc0b2b63
3 files changed
+9 -17

No files matched your search

@@ -1,5 +1,6 @@
package com.sap.sailing.gwt.ui.client.shared.filter;
import java.util.ArrayList;
import java.util.List;
import com.google.gwt.user.client.ui.ListBox;
@@ -12,11 +13,12 @@ import com.sap.sailing.gwt.ui.client.FilterWithUI;
public abstract class AbstractFilterWithUI<FilterObjectType, ValueType> extends AbstractFilter<FilterObjectType, ValueType>
implements FilterWithUI<FilterObjectType, ValueType> {
protected static List<FilterOperators> supportedOperators;
protected List<FilterOperators> supportedOperators;
protected FilterOperators defaultOperator;
public AbstractFilterWithUI(FilterOperators defaultOperator) {
this.defaultOperator = defaultOperator;
supportedOperators = new ArrayList<FilterOperators>();
}
@Override
@@ -1,7 +1,5 @@
package com.sap.sailing.gwt.ui.client.shared.filter;
import java.util.ArrayList;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
@@ -15,17 +13,14 @@ import com.sap.sailing.gwt.ui.shared.CompetitorDTO;
public class CompetitorNationalityFilter extends AbstractFilterWithUI<CompetitorDTO, String> {
public static final String FILTER_NAME = "CompetitorNationalityFilter";
static {
supportedOperators = new ArrayList<FilterOperators>();
public CompetitorNationalityFilter() {
super(FilterOperators.Equals);
supportedOperators.add(FilterOperators.Equals);
supportedOperators.add(FilterOperators.NotEqualTo);
supportedOperators.add(FilterOperators.Contains);
supportedOperators.add(FilterOperators.NotContains);
}
public CompetitorNationalityFilter() {
super(FilterOperators.Equals);
}
public Class<String> getValueType() {
return String.class;
@@ -1,7 +1,5 @@
package com.sap.sailing.gwt.ui.client.shared.filter;
import java.util.ArrayList;
import com.google.gwt.user.client.ui.IntegerBox;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Widget;
@@ -18,8 +16,9 @@ public class CompetitorTotalRankFilter extends AbstractCompetitorInLeaderboardFi
private IntegerBox valueInputWidget;
private ListBox operatorSelectionWidget;
static {
supportedOperators = new ArrayList<FilterOperators>();
public CompetitorTotalRankFilter() {
super(FilterOperators.GreaterThanEquals);
supportedOperators.add(FilterOperators.LessThanEquals);
supportedOperators.add(FilterOperators.GreaterThanEquals);
supportedOperators.add(FilterOperators.LessThan);
@@ -28,10 +27,6 @@ public class CompetitorTotalRankFilter extends AbstractCompetitorInLeaderboardFi
supportedOperators.add(FilterOperators.Equals);
}
public CompetitorTotalRankFilter() {
super(FilterOperators.GreaterThanEquals);
}
public Class<Integer> getValueType() {
return Integer.class;
}