Skip to content

Commit a8abfac

Browse files
hpehlhpehl
committed
Showcase compiles
1 parent 8ecc504 commit a8abfac

File tree

75 files changed

+406
-570
lines changed

Some content is hidden

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

75 files changed

+406
-570
lines changed

‎components/src/main/java/org/patternfly/component/BaseComponent.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.jboss.elemento.ElementEventMethods;
2323
import org.jboss.elemento.ElementIdMethods;
2424
import org.jboss.elemento.ElementQueryMethods;
25-
import org.jboss.elemento.ElementTextMethods;
2625
import org.jboss.elemento.HTMLElementAttributeMethods;
2726
import org.jboss.elemento.HTMLElementDataMethods;
2827
import org.jboss.elemento.HTMLElementStyleMethods;
@@ -42,7 +41,6 @@ public abstract class BaseComponent<E extends HTMLElement, B extends TypedBuilde
4241
ElementEventMethods<E, B>,
4342
ElementIdMethods<E, B>,
4443
ElementQueryMethods<E>,
45-
ElementTextMethods<E, B>,
4644
HTMLElementAttributeMethods<E, B>,
4745
HTMLElementDataMethods<E, B>,
4846
HTMLElementStyleMethods<E, B>,

‎components/src/main/java/org/patternfly/component/BaseComponent2.java‎

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

‎components/src/main/java/org/patternfly/component/BaseComponentFlat.java‎

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

‎components/src/main/java/org/patternfly/component/BaseComponentSVG.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.jboss.elemento.ElementEventMethods;
2323
import org.jboss.elemento.ElementIdMethods;
2424
import org.jboss.elemento.ElementQueryMethods;
25-
import org.jboss.elemento.ElementTextMethods;
2625
import org.jboss.elemento.TypedBuilder;
2726
import org.jboss.elemento.svg.SVGElement;
2827
import org.jboss.elemento.svg.SVGElementDataMethods;
@@ -39,7 +38,6 @@ public abstract class BaseComponentSVG<E extends SVGElement, B extends TypedBuil
3938
ElementEventMethods<E, B>,
4039
ElementIdMethods<E, B>,
4140
ElementQueryMethods<E>,
42-
ElementTextMethods<E, B>,
4341
SVGElementDataMethods<E, B>,
4442
SVGElementStyleMethods<E, B> {
4543

‎components/src/main/java/org/patternfly/component/ComponentDelegate.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.jboss.elemento.ElementEventMethods;
2323
import org.jboss.elemento.ElementIdMethods;
2424
import org.jboss.elemento.ElementQueryMethods;
25-
import org.jboss.elemento.ElementTextMethods;
2625
import org.jboss.elemento.HTMLElementAttributeMethods;
2726
import org.jboss.elemento.HTMLElementDataMethods;
2827
import org.jboss.elemento.HTMLElementStyleMethods;
@@ -34,7 +33,6 @@
3433

3534
import static java.util.Objects.requireNonNull;
3635

37-
@Deprecated
3836
public abstract class ComponentDelegate<E extends HTMLElement, B extends TypedBuilder<E, B>> implements
3937
Component,
4038
ElementAttributeMethods<E, B>,
@@ -44,7 +42,6 @@ public abstract class ComponentDelegate<E extends HTMLElement, B extends TypedBu
4442
ElementEventMethods<E, B>,
4543
ElementIdMethods<E, B>,
4644
ElementQueryMethods<E>,
47-
ElementTextMethods<E, B>,
4845
HTMLElementAttributeMethods<E, B>,
4946
HTMLElementDataMethods<E, B>,
5047
HTMLElementStyleMethods<E, B>,

‎components/src/main/java/org/patternfly/component/ComponentStore.java‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ final class ComponentStore {
3636
private static final String KEY_PREFIX = "pfcs"; // PatternFly component store
3737
private static final String CATEGORY = "ComponentStore";
3838
private static final Map<String, BaseComponent<?, ?>> components = new HashMap<>();
39-
private static final Map<String, BaseComponent2<?, ?>> components2 = new HashMap<>();
4039
private static final Map<String, ComponentDelegate<?, ?>> componentDelegates = new HashMap<>();
41-
private static final Map<String, BaseComponentFlat<?, ?>> flatComponents = new HashMap<>();
4240
private static final Map<String, SubComponent<?, ?>> subComponents = new HashMap<>();
4341

4442
// ------------------------------------------------------ store
@@ -54,17 +52,6 @@ static <E extends HTMLElement, B extends TypedBuilder<E, B>> void storeComponent
5452
}
5553
}
5654

57-
static <E extends HTMLElement, B extends TypedBuilder<E, B>> void storeComponent2(BaseComponent2<E, B> component) {
58-
String uuid = uuid();
59-
components2.put(uuid, component);
60-
component.element().dataset.set(key(component.componentType()), uuid);
61-
onDetach(component.element(), __ -> remove(uuid, "component", components::remove));
62-
if (logger.isEnabled(DEBUG)) {
63-
logger.debug("Store component %s as %s on %o%s", component.componentType().componentName, uuid,
64-
component.element(), count());
65-
}
66-
}
67-
6855
static <E extends HTMLElement, B extends TypedBuilder<E, B>> void storeComponentDelegate(
6956
ComponentDelegate<E, B> component) {
7057
if (component.delegate == null) {
@@ -81,17 +68,6 @@ static <E extends HTMLElement, B extends TypedBuilder<E, B>> void storeComponent
8168
}
8269
}
8370

84-
static <E extends HTMLElement, B extends TypedBuilder<E, B>> void storeFlatComponent(BaseComponentFlat<E, B> component) {
85-
String uuid = uuid();
86-
flatComponents.put(uuid, component);
87-
component.element().dataset.set(key(component.componentType()), uuid);
88-
onDetach(component.element(), __ -> remove(uuid, "flat component", flatComponents::remove));
89-
if (logger.isEnabled(DEBUG)) {
90-
logger.debug("Store flat component %s as %s on %o%s", component.componentType().componentName, uuid,
91-
component.element(), count());
92-
}
93-
}
94-
9571
static <E extends HTMLElement, B extends TypedBuilder<E, B>> void storeSubComponent(SubComponent<E, B> subComponent) {
9672
String uuid = uuid();
9773
subComponents.put(uuid, subComponent);
@@ -112,27 +88,13 @@ static <C extends BaseComponent<E, B>, E extends HTMLElement, B extends TypedBui
11288
key -> (C) components.get(key));
11389
}
11490

115-
@SuppressWarnings("unchecked")
116-
static <C extends BaseComponent2<E, B>, E extends HTMLElement, B extends TypedBuilder<E, B>> C lookupComponent2(
117-
ComponentType componentType, HTMLElement element, boolean lenient) {
118-
return lookup(componentType, null, key(componentType), element, lenient, "component",
119-
key -> (C) components2.get(key));
120-
}
121-
12291
@SuppressWarnings("unchecked")
12392
static <C extends ComponentDelegate<E, B>, E extends HTMLElement, B extends TypedBuilder<E, B>> C lookupComponentDelegate(
12493
ComponentType componentType, HTMLElement element, boolean lenient) {
12594
return lookup(componentType, null, key(componentType), element, lenient, "component delegate",
12695
key -> (C) componentDelegates.get(key));
12796
}
12897

129-
@SuppressWarnings("unchecked")
130-
static <C extends BaseComponentFlat<E, B>, E extends HTMLElement, B extends TypedBuilder<E, B>> C lookupFlatComponent(
131-
ComponentType componentType, HTMLElement element, boolean lenient) {
132-
return lookup(componentType, null, key(componentType), element, lenient, "flat component",
133-
key -> (C) flatComponents.get(key));
134-
}
135-
13698
@SuppressWarnings("unchecked")
13799
static <S extends SubComponent<E, B>, E extends HTMLElement, B extends TypedBuilder<E, B>> S lookupSubComponent(
138100
ComponentType componentType, String name, HTMLElement element, boolean lenient) {
@@ -191,6 +153,6 @@ private static <T> void remove(String uuid, String type, Function<String, T> rem
191153
}
192154

193155
private static String count() {
194-
return " (c:" + components.size() + "|cd:" + componentDelegates.size() + "|fc:" + flatComponents.size() + "|sc:" + subComponents.size() + ")";
156+
return " (c:" + components.size() + "|cd:" + componentDelegates.size() + "|sc:" + subComponents.size() + ")";
195157
}
196158
}

‎components/src/main/java/org/patternfly/component/ElementContainerDelegate.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Copyright 2023 Red Hat
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.patternfly.component;
17+
18+
import java.util.function.Supplier;
19+
20+
import org.jboss.elemento.ElementContainerMethods;
21+
import org.jboss.elemento.TypedBuilder;
22+
23+
import elemental2.dom.Element;
24+
import elemental2.dom.HTMLElement;
25+
import elemental2.dom.Node;
26+
27+
/**
28+
* Delegates all {@code add()} methods from {@link ElementContainerMethods} to the element returned by {@link #delegate()}.
29+
* <p>
30+
* Please note that if you implement this interface in your (sub)component, you must use {@code element().appendChild()} to add
31+
* something to the (sub)component itself!
32+
*/
33+
public interface ElementContainerDelegate<E extends Element, B extends TypedBuilder<E, B>> extends
34+
TypedBuilder<E, B>,
35+
ElementContainerMethods<E, B> {
36+
37+
HTMLElement delegate();
38+
39+
@Override
40+
default B add(Node node) {
41+
delegate().appendChild(node);
42+
return that();
43+
}
44+
45+
@Override
46+
default B add(Supplier<Node> supplier) {
47+
delegate().appendChild(supplier.get());
48+
return that();
49+
}
50+
}

0 commit comments

Comments
 (0)