Skip to content

Commit 457524c

Browse files
vegegokuvegegoku
committed
fix #1086 Deprecation cleanup
1 parent 77a2e35 commit 457524c

File tree

78 files changed

+4314
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+4314
-665
lines changed

‎domino-ui-tools/mdi-icons-processor/src/main/java/org/dominokit/ui/tools/processor/MdiIconsProcessingStep.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/** MdiIconsProcessingStep class. */
3535
public class MdiIconsProcessingStep {
3636

37-
private static final String MDI_VERSION = "v7.2.96";
37+
private static final String MDI_VERSION = "v7.4.47";
3838
private static final Logger LOGGER = LoggerFactory.getLogger(MdiIconsProcessingStep.class);
3939
/** Constant <code>ICONS_ROOT_PACKAGE="org.dominokit.domino.ui.icons"</code> */
4040
public static final String ICONS_ROOT_PACKAGE = "org.dominokit.domino.ui.icons";

‎domino-ui/src/main/java/org/dominokit/domino/ui/button/ToggleButtonsGroup.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.Collections;
2323
import java.util.HashSet;
2424
import java.util.Objects;
25+
import java.util.Optional;
2526
import java.util.Set;
2627
import java.util.stream.Collectors;
2728
import org.dominokit.domino.ui.button.group.BaseButtonsGroup;
@@ -93,20 +94,20 @@ public void onItemToggle(ToggleButton toggleItem) {
9394
triggerChangeListeners(oldValue, newValue);
9495
} else {
9596
DomGlobal.console.info("Only multiple toggle is allowed for this group");
96-
getButtons().stream()
97-
.filter(ToggleButton::isToggled)
98-
.filter(button -> !button.equals(toggleItem))
99-
.findFirst()
100-
.ifPresentOrElse(
101-
toggleButton -> {
102-
toggleButton.updateToggle(false, false);
103-
triggerChangeListeners(
104-
new HashSet<>(Collections.singleton(toggleButton)),
105-
new HashSet<>(Collections.singleton(toggleItem)));
106-
},
107-
() ->
108-
triggerChangeListeners(
109-
new HashSet<>(), new HashSet<>(Collections.singleton(toggleItem))));
97+
Optional<ToggleButton> first =
98+
getButtons().stream()
99+
.filter(ToggleButton::isToggled)
100+
.filter(button -> !button.equals(toggleItem))
101+
.findFirst();
102+
if (first.isPresent()) {
103+
ToggleButton toggleButton = first.get();
104+
toggleButton.updateToggle(false, false);
105+
triggerChangeListeners(
106+
new HashSet<>(Collections.singleton(toggleButton)),
107+
new HashSet<>(Collections.singleton(toggleItem)));
108+
} else {
109+
triggerChangeListeners(new HashSet<>(), new HashSet<>(Collections.singleton(toggleItem)));
110+
}
110111
}
111112
}
112113
}

‎domino-ui/src/main/java/org/dominokit/domino/ui/carousel/Slide.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -319,15 +319,6 @@ public DivElement getCaptionElement() {
319319
return captionElement.get();
320320
}
321321

322-
/**
323-
* @return The element of the image of this slide.
324-
* @deprecated use {@link #getWrappedElement()}
325-
*/
326-
@Deprecated
327-
public DominoElement<Element> getImageElement() {
328-
return elementOf(wrappedElement);
329-
}
330-
331322
/** @return The element wrapped by this slide. */
332323
public DominoElement<Element> getWrappedElement() {
333324
return elementOf(wrappedElement);

‎domino-ui/src/main/java/org/dominokit/domino/ui/datatable/plugins/column/PinColumnsPlugin.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,26 +158,26 @@ public void onAfterAddHeaders(DataTable<T> dataTable) {
158158
MenuItem.<String>create(config.getPinLeftText())
159159
.withValue("left")
160160
.appendChild(PrefixAddOn.of(Icons.dock_left()))
161-
.addSelectionHandler(
162-
value -> {
161+
.addSelectionListener(
162+
(source, selection) -> {
163163
setPinLeftColumn(column);
164164
applyPinnedColumns();
165165
}))
166166
.appendChild(
167167
MenuItem.<String>create(config.getPinRightText())
168168
.withValue("right")
169169
.appendChild(PrefixAddOn.of(Icons.dock_right()))
170-
.addSelectionHandler(
171-
value -> {
170+
.addSelectionListener(
171+
(source, selection) -> {
172172
setPinRightColumn(column);
173173
applyPinnedColumns();
174174
}))
175175
.appendChild(
176176
MenuItem.<String>create(config.getUnpinText())
177177
.withValue("right")
178178
.appendChild(PrefixAddOn.of(Icons.pin_off()))
179-
.addSelectionHandler(
180-
value -> {
179+
.addSelectionListener(
180+
(source, selection) -> {
181181
unpinColumn(column);
182182
}));
183183
}

‎domino-ui/src/main/java/org/dominokit/domino/ui/datatable/plugins/header/HeaderBarPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,8 @@ public Element asElement(DataTable<T> dataTable) {
565565
elements
566566
.div()
567567
.textContent(columnConfig.getTitle())))
568-
.addSelectionHandler(
569-
value ->
568+
.addSelectionListener(
569+
(source, selection) ->
570570
columnConfig.toggleDisplay(
571571
columnConfig.isHidden())));
572572
}));

‎domino-ui/src/main/java/org/dominokit/domino/ui/datatable/plugins/selection/SelectionPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ private HTMLElement createMultiSelectHeader(DataTable<T> dataTable) {
335335
}
336336
});
337337

338-
dataTable.addSelectionDeselectionListener(
338+
dataTable.addSelectionChangeListener(
339339
(source, selectedRows) -> {
340340
updateHeaderCheckBox(selectedRows);
341341
});

‎domino-ui/src/main/java/org/dominokit/domino/ui/dialogs/AbstractDialog.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -441,19 +441,6 @@ public T setStretchHeight(IsDialogHeight size) {
441441
return (T) this;
442442
}
443443

444-
/**
445-
* @dominokit-site-ignore
446-
* @deprecated use {@link #addCss(org.dominokit.domino.ui.style.CssClass...)} with {@link
447-
* DialogType} or the styles from {@link DialogStyles} setType.
448-
* @param type {@link org.dominokit.domino.ui.dialogs.DialogType}
449-
* @return same Dialog instance
450-
*/
451-
@Deprecated
452-
public T setType(DialogType type) {
453-
addCss(type);
454-
return (T) this;
455-
}
456-
457444
/**
458445
* Checks if the dialog is modal, i.e., if it blocks interactions with the rest of the page.
459446
*

‎domino-ui/src/main/java/org/dominokit/domino/ui/dialogs/DialogStyles.java‎

Lines changed: 51 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import org.dominokit.domino.ui.style.CompositeCssClass;
1919
import org.dominokit.domino.ui.style.CssClass;
20+
import org.dominokit.domino.ui.style.LimitOneOfCssClass;
2021
import org.dominokit.domino.ui.style.ReplaceCssClass;
2122

2223
/** Constants for dialogs css classes names */
@@ -54,42 +55,61 @@ public interface DialogStyles {
5455
/** Constant <code>dui_maximized</code> */
5556
CssClass dui_maximized = () -> "dui-maximized";
5657

57-
CssClass dui_left_sheet =
58-
new ReplaceCssClass(
59-
CompositeCssClass.of(
60-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-right-sheet"),
61-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-top-sheet"),
62-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-bottom-sheet")))
63-
.replaceWith(CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-left-sheet"));
58+
CssClass dui_side_sheet =
59+
LimitOneOfCssClass.of(() -> "dui-side-sheet", () -> "dui-horizontal-sheet")
60+
.use(() -> "dui-side-sheet");
61+
CssClass dui_horizontal_sheet =
62+
LimitOneOfCssClass.of(() -> "dui-side-sheet", () -> "dui-horizontal-sheet")
63+
.use(() -> "dui-horizontal-sheet");
6464

6565
CssClass dui_right_sheet =
66-
new ReplaceCssClass(
67-
CompositeCssClass.of(
68-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-left-sheet"),
69-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-top-sheet"),
70-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-bottom-sheet")))
71-
.replaceWith(CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-right-sheet"));
66+
CompositeCssClass.of(
67+
dui_side_sheet,
68+
LimitOneOfCssClass.of(
69+
() -> "dui-right-sheet",
70+
() -> "dui-top-sheet",
71+
() -> "dui-bottom-sheet",
72+
() -> "dui-left-sheet")
73+
.use(() -> "dui-right-sheet"));
74+
75+
CssClass dui_left_sheet =
76+
CompositeCssClass.of(
77+
dui_side_sheet,
78+
LimitOneOfCssClass.of(
79+
() -> "dui-right-sheet",
80+
() -> "dui-top-sheet",
81+
() -> "dui-bottom-sheet",
82+
() -> "dui-left-sheet")
83+
.use(() -> "dui-left-sheet"));
84+
7285
CssClass dui_top_sheet =
73-
new ReplaceCssClass(
74-
CompositeCssClass.of(
75-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-left-sheet"),
76-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-right-sheet"),
77-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-bottom-sheet")))
78-
.replaceWith(CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-top-sheet"));
86+
CompositeCssClass.of(
87+
dui_horizontal_sheet,
88+
LimitOneOfCssClass.of(
89+
() -> "dui-right-sheet",
90+
() -> "dui-top-sheet",
91+
() -> "dui-bottom-sheet",
92+
() -> "dui-left-sheet")
93+
.use(() -> "dui-top-sheet"));
94+
7995
CssClass dui_bottom_sheet =
80-
new ReplaceCssClass(
81-
CompositeCssClass.of(
82-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-left-sheet"),
83-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-right-sheet"),
84-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-top-sheet")))
85-
.replaceWith(
86-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-bottom-sheet"));
96+
CompositeCssClass.of(
97+
dui_horizontal_sheet,
98+
LimitOneOfCssClass.of(
99+
() -> "dui-right-sheet",
100+
() -> "dui-top-sheet",
101+
() -> "dui-bottom-sheet",
102+
() -> "dui-left-sheet")
103+
.use(() -> "dui-bottom-sheet"));
104+
87105
CssClass dui_no_sheet =
88-
new ReplaceCssClass(
106+
ReplaceCssClass.of(
89107
CompositeCssClass.of(
90-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-left-sheet"),
91-
CompositeCssClass.of(() -> "dui-side-sheet", () -> "dui-right-sheet"),
92-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-bottom-sheet"),
93-
CompositeCssClass.of(() -> "dui-horizontal-sheet", () -> "dui-top-sheet")))
108+
dui_side_sheet,
109+
dui_horizontal_sheet,
110+
dui_right_sheet,
111+
dui_left_sheet,
112+
dui_bottom_sheet,
113+
dui_top_sheet))
94114
.replaceWith(CssClass.NONE);
95115
}

‎domino-ui/src/main/java/org/dominokit/domino/ui/dialogs/DialogType.java‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎domino-ui/src/main/java/org/dominokit/domino/ui/dialogs/ModalBackDrop.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private ModalBackDrop() {
6767
}
6868
})
6969
.addEventListener(
70-
EventType.keypress,
70+
EventType.keydown,
7171
event -> {
7272
if (ModalBackDrop.INSTANCE.isEqualNode(Js.uncheckedCast(event.target))) {
7373
closeCurrentOpen();

0 commit comments

Comments
 (0)