Skip to content

Commit 44df395

Browse files
javier-godoypaodb
authored andcommitted
refactor: use lombok extension mechanism
1 parent 9cadeea commit 44df395

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/main/java/com/flowingcode/vaadin/addons/gridhelpers/EnhancedSelectionGridHelper.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import com.vaadin.flow.component.grid.Grid;
2727
import com.vaadin.flow.component.grid.dataview.GridListDataView;
2828
import com.vaadin.flow.shared.Registration;
29-
import elemental.json.JsonObject;
3029
import java.io.Serializable;
3130
import java.util.Optional;
3231
import java.util.stream.Collectors;
3332
import java.util.stream.IntStream;
3433
import lombok.RequiredArgsConstructor;
34+
import lombok.experimental.ExtensionMethod;
3535

3636
/**
3737
* Add support for multiple items selection using click, arrow up/down, shift+click, shift+arrow
@@ -40,6 +40,7 @@
4040
*/
4141
@SuppressWarnings("serial")
4242
@RequiredArgsConstructor
43+
@ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true)
4344
class EnhancedSelectionGridHelper<T> implements Serializable {
4445

4546
private static final String KEY_UP_EVENT_SHIFT_KEY = "event.shiftKey";
@@ -103,27 +104,26 @@ void enableEnhancedSelection() {
103104
});
104105

105106
keyUpRegistration = grid.getElement().addEventListener("keyup", ev -> {
106-
JsonObject eventData = JsonMigration.getEventData(ev);
107-
108-
String keyUp = eventData.getString(KEY_UP_EVENT_KEY);
107+
String keyUp = ev.getEventData().getString(KEY_UP_EVENT_KEY);
109108
boolean arrowsKey = "ArrowDown".equals(keyUp) || "ArrowUp".equals(keyUp);
110109

111110
GridListDataView<T> dataView = grid.getListDataView();
112111

113112
Optional<T> newFocusedItemMaybe = Optional.empty();
114-
int newFocusedItemIndex = (int) eventData.getNumber(KEY_UP_ELEMENT_FOCUSED_ITEM_INDEX);
113+
int newFocusedItemIndex =
114+
(int) ev.getEventData().getNumber(KEY_UP_ELEMENT_FOCUSED_ITEM_INDEX);
115115
if (newFocusedItemIndex >= 0) {
116116
newFocusedItemMaybe = dataView.getItems().skip(newFocusedItemIndex).findFirst();
117117
}
118118

119119
if (newFocusedItemMaybe.isPresent()) {
120120
T newFocusedItem = newFocusedItemMaybe.get();
121-
boolean isSpecialKey = eventData.getBoolean(KEY_UP_EVENT_META_KEY)
122-
|| eventData.getBoolean(KEY_UP_EVENT_CTRL_KEY)
123-
|| eventData.getBoolean(KEY_UP_EVENT_ALT_KEY);
121+
boolean isSpecialKey = ev.getEventData().getBoolean(KEY_UP_EVENT_META_KEY)
122+
|| ev.getEventData().getBoolean(KEY_UP_EVENT_CTRL_KEY)
123+
|| ev.getEventData().getBoolean(KEY_UP_EVENT_ALT_KEY);
124124

125125
Object lastFocusedItem = ComponentUtil.getData(grid, LAST_FOCUSED_ITEM);
126-
boolean shiftKey = eventData.getBoolean(KEY_UP_EVENT_SHIFT_KEY);
126+
boolean shiftKey = ev.getEventData().getBoolean(KEY_UP_EVENT_SHIFT_KEY);
127127
if (shiftKey) {
128128
if (lastFocusedItem == null) {
129129
ComponentUtil.setData(grid, LAST_FOCUSED_ITEM, newFocusedItem);

src/main/java/com/flowingcode/vaadin/addons/gridhelpers/ResponsiveGridHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@
3232
import java.util.TreeMap;
3333
import lombok.Getter;
3434
import lombok.RequiredArgsConstructor;
35+
import lombok.experimental.ExtensionMethod;
3536

3637
@SuppressWarnings("serial")
3738
@RequiredArgsConstructor
39+
@ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true)
3840
class ResponsiveGridHelper<T> implements Serializable {
3941

4042
private final GridHelper<T> helper;
@@ -77,7 +79,7 @@ GridResponsiveStep<T> getOrCreate(int minWidth) {
7779
private void initialize() {
7880
Grid<T> grid = helper.getGrid();
7981
grid.getElement().addEventListener("fcgh-responsive-step", ev -> {
80-
apply((int) JsonMigration.getEventData(ev).getNumber("event.detail.step"), false);
82+
apply((int) ev.getEventData().getNumber("event.detail.step"), false);
8183
}).addEventData("event.detail.step").debounce(200, DebouncePhase.TRAILING);
8284
sendSteps();
8385
}

0 commit comments

Comments
 (0)