Skip to content
This repository was archived by the owner on Jul 29, 2022. It is now read-only.

Added support for icon generation from ConnectorResources #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for icon generation from ConnectorResources #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 53 additions & 17 deletions vaadin-combobox-multiselect-addon/src/main/java/org/vaadin/addons/ComboBoxMultiselect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import com.vaadin.data.provider.DataGenerator;
import com.vaadin.server.ConnectorResource;
import com.vaadin.shared.ui.combobox.ComboBoxConstants;
import org.apache.commons.lang3.StringUtils;
import org.jsoup.nodes.Element;
import org.vaadin.addons.client.ComboBoxMultiselectConstants;
Expand Down Expand Up @@ -310,23 +313,56 @@ private void init() {
registerRpc(this.rpc);
registerRpc(new FocusAndBlurServerRpcDecorator(this, this::fireEvent));

addDataGenerator((final T data, final JsonObject jsonObject) -> {
String caption = getItemCaptionGenerator().apply(data);
if (caption == null) {
caption = "";
}
jsonObject.put(DataCommunicatorConstants.NAME, caption);
final String style = this.itemStyleGenerator.apply(data);
if (style != null) {
jsonObject.put(ComboBoxMultiselectConstants.STYLE, style);
}
final Resource icon = getItemIconGenerator().apply(data);
if (icon != null) {
final String iconUrl = ResourceReference.create(icon, ComboBoxMultiselect.this, null)
.getURL();
jsonObject.put(ComboBoxMultiselectConstants.ICON, iconUrl);
}
});
addDataGenerator(new DataGenerator<T>() {

private Map<Object, String> resourceKeyMap = new HashMap();
private int counter = 0;

@Override
public void generateData(T item, JsonObject jsonObject) {
String caption = getItemCaptionGenerator().apply(item);
if (caption == null) {
caption = "";
}
jsonObject.put(DataCommunicatorConstants.NAME, caption);
String style = itemStyleGenerator.apply(item);
if (style != null) {
jsonObject.put(ComboBoxConstants.STYLE, style);
}
Resource icon = getItemIcon(item);
if (icon != null) {
String iconKey = resourceKeyMap
.get(getDataProvider().getId(item));
String iconUrl = ResourceReference
.create(icon, ComboBoxMultiselect.this, iconKey).getURL();
jsonObject.put(ComboBoxConstants.ICON, iconUrl);
}
}

@Override
public void destroyData(T item) {
Object itemId = getDataProvider().getId(item);
if (this.resourceKeyMap.containsKey(itemId)) {
setResource(this.resourceKeyMap.get(itemId), null);
this.resourceKeyMap.remove(itemId);
}

}

private Resource getItemIcon(T item) {
Resource icon = getItemIconGenerator().apply(item);
if (!(icon instanceof ConnectorResource)) {
return icon;
}

Object itemId = getDataProvider().getId(item);
if (!resourceKeyMap.containsKey(itemId)) {
resourceKeyMap.put(itemId, ComboBoxMultiselectConstants.ICON + (counter++));
}
setResource(resourceKeyMap.get(itemId), icon);
return icon;
}
});
}

/**
Expand Down