Merge branch 'master' into bug4211

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html
This commit is contained in:
Steffen Jacobs committed 2018-10-15 18:09:27 +02:00
commit fbcb0b28bf
52 files changed
+707 -325

No files matched your search

@@ -20,6 +20,7 @@ import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.dom.client.Style.TextAlign;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.i18n.client.LocaleInfo;
import com.google.gwt.user.cellview.client.AbstractCellTable;
import com.google.gwt.user.cellview.client.Column;
import com.google.gwt.user.cellview.client.DataGrid;
import com.google.gwt.user.cellview.client.TextColumn;
@@ -118,11 +119,16 @@ public class DimensionFilterSelectionProvider extends AbstractDataMiningComponen
availableData = new HashSet<>();
filteredData = new ListDataProvider<Serializable>(this::elementAsString);
filterPanel = new AbstractFilterablePanel<Serializable>(null, dataGrid, filteredData) {
filterPanel = new AbstractFilterablePanel<Serializable>(null, filteredData) {
@Override
public Iterable<String> getSearchableStrings(Serializable element) {
return Collections.singleton(elementAsString(element));
}
@Override
public AbstractCellTable<Serializable> getCellTable() {
return dataGrid;
}
};
filterPanel.setWidth("100%");
filterPanel.setSpacing(1);
@@ -148,12 +148,16 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDa
filteredFilterDimensions.addDataDisplay(filterDimensionsList);
filterFilterDimensionsPanel = new AbstractFilterablePanel<DimensionWithContext>(
null, filterDimensionsList, filteredFilterDimensions)
{
null, filteredFilterDimensions) {
@Override
public Iterable<String> getSearchableStrings(DimensionWithContext dimension) {
return dimension.getMatchingStrings();
}
@Override
public AbstractCellTable<DimensionWithContext> getCellTable() {
return filterDimensionsList;
}
};
filterFilterDimensionsPanel.addStyleName("filterFilterDimensionsPanel");
filterFilterDimensionsPanel.setSpacing(2);