From 336293d12557bb89fb925289d181434ffa70df42 Mon Sep 17 00:00:00 2001 From: Dmitii Tikhomirov Date: Thu, 17 Mar 2022 16:24:21 -0700 Subject: [PATCH] removed elemento, because it's not supported anymore --- internal-bom/pom.xml | 6 -- ui/databinding/api/pom.xml | 4 - .../client/BindableProxyAgent.java | 21 ++--- ui/navigation/api/pom.xml | 4 - .../client/local/ContentDelegation.java | 10 +- .../local/DefaultContentDelegation.java | 23 +++-- .../navigation/client/local/Navigation.java | 91 ++++++++++++------- .../client/local/PageTransitionProvider.java | 4 +- .../TransitionAnchorFactoryProvider.java | 4 +- .../client/local/spi/NavigationGraph.java | 2 +- ui/navigation/generator/pom.xml | 4 - .../generator/NavigationGraphGenerator.java | 5 +- ui/templates/api/pom.xml | 10 -- .../ui/templates/client/TemplateUtil.java | 7 +- .../crysknife/ui/templates/Template.gwt.xml | 1 - .../generator/TemplatedGenerator.java | 13 +-- .../generator/TemplatedGeneratorUtils.java | 10 +- .../processor/context/DataElementInfo.java | 2 +- 18 files changed, 99 insertions(+), 122 deletions(-) diff --git a/internal-bom/pom.xml b/internal-bom/pom.xml index 36176f7a..3e6f1086 100644 --- a/internal-bom/pom.xml +++ b/internal-bom/pom.xml @@ -63,7 +63,6 @@ 3.11 2.8.0 - 1.0.3 1.11.3 1 1.10 @@ -107,11 +106,6 @@ elemental2-dom ${elemental2.version} - - org.jboss.elemento - elemento-core - ${elemento.version} - com.google.auto auto-common diff --git a/ui/databinding/api/pom.xml b/ui/databinding/api/pom.xml index 88367e7c..7d7d34da 100644 --- a/ui/databinding/api/pom.xml +++ b/ui/databinding/api/pom.xml @@ -53,10 +53,6 @@ org.gwtproject.widgets gwt-widgets - - org.jboss.elemento - elemento-core - io.crysknife crysknife-annotations diff --git a/ui/databinding/api/src/main/java/io/crysknife/ui/databinding/client/BindableProxyAgent.java b/ui/databinding/api/src/main/java/io/crysknife/ui/databinding/client/BindableProxyAgent.java index f896661f..562ec432 100644 --- a/ui/databinding/api/src/main/java/io/crysknife/ui/databinding/client/BindableProxyAgent.java +++ b/ui/databinding/api/src/main/java/io/crysknife/ui/databinding/client/BindableProxyAgent.java @@ -27,6 +27,7 @@ import elemental2.dom.DomGlobal; import elemental2.dom.HTMLElement; +import io.crysknife.client.IsElement; import jsinterop.annotations.JsFunction; import jsinterop.base.Js; import org.gwtproject.core.client.JavaScriptObject; @@ -45,7 +46,6 @@ import org.gwtproject.user.client.ui.HasValue; import org.gwtproject.user.client.ui.ValueBoxBase; import org.gwtproject.user.client.ui.Widget; -import org.jboss.elemento.IsElement; import io.crysknife.client.internal.Assert; import io.crysknife.client.internal.collections.Multimap; import io.crysknife.ui.databinding.client.api.Convert; @@ -153,10 +153,7 @@ private static Supplier, if (component instanceof HasValue) { registrar = mergeHasValueChangeHandler(component, modelUpdater, registrar); } else if (component instanceof IsElement) { - registrar = mergeNativeChangeEventListener(((IsElement) component).element(), uiGetter, - modelUpdater, registrar); - } else if (component instanceof IsElement) { - registrar = mergeNativeChangeEventListener(((IsElement) component).element(), uiGetter, + registrar = mergeNativeChangeEventListener(((IsElement) component).getElement(), uiGetter, modelUpdater, registrar); } else if (isElement(component)) { registrar = mergeNativeChangeEventListener(component, uiGetter, modelUpdater, registrar); @@ -169,10 +166,7 @@ private static Supplier, registrar = mergeNativeKeyUpEventListener(((ElementWrapperWidget) component).getElement(), uiGetter, modelUpdater, registrar); } else if (component instanceof IsElement) { - registrar = mergeNativeKeyUpEventListener(((IsElement) component).element(), uiGetter, - modelUpdater, registrar); - } else if (component instanceof IsElement) { - registrar = mergeNativeKeyUpEventListener(((IsElement) component).element(), uiGetter, + registrar = mergeNativeKeyUpEventListener(((IsElement) component).getElement(), uiGetter, modelUpdater, registrar); } else if (isElement(component)) { registrar = mergeNativeKeyUpEventListener(component, uiGetter, modelUpdater, registrar); @@ -384,9 +378,8 @@ private Optional> maybeCreateUIGetter(final Object component) { } else if (component instanceof HasText) { return createHasTextGetter((HasText) component); } else if (component instanceof IsElement) { - return maybeCreateElementValueGetter(BoundUtil.asElement(((IsElement) component).element())); - } else if (component instanceof IsElement) { - return maybeCreateElementValueGetter(BoundUtil.asElement(((IsElement) component).element())); + return maybeCreateElementValueGetter( + BoundUtil.asElement(((IsElement) component).getElement())); } else if (isElement(component)) { return maybeCreateElementValueGetter(BoundUtil.asElement(component)); } else { @@ -762,9 +755,7 @@ private

void updateWidgetsAndFireEvent(final boolean sync, final String prop private Object getUIPart(final Object component) { if (component instanceof IsElement) { - return ((IsElement) component).element(); - } else if (component instanceof IsElement) { - return ((IsElement) component).element(); + return ((IsElement) component).getElement(); } else { return component; } diff --git a/ui/navigation/api/pom.xml b/ui/navigation/api/pom.xml index afa184ba..66c995f5 100644 --- a/ui/navigation/api/pom.xml +++ b/ui/navigation/api/pom.xml @@ -49,10 +49,6 @@ io.crysknife crysknife-core - - org.jboss.elemento - elemento-core - org.gwtproject.regexp gwt-regexp diff --git a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/ContentDelegation.java b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/ContentDelegation.java index 1c96359f..e7aed06d 100644 --- a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/ContentDelegation.java +++ b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/ContentDelegation.java @@ -14,8 +14,8 @@ package io.crysknife.ui.navigation.client.local; +import elemental2.core.JsArray; import elemental2.dom.HTMLElement; -import org.jboss.elemento.ElementsBag; import io.crysknife.ui.navigation.client.local.api.DelegationControl; /** @@ -34,8 +34,8 @@ public interface ContentDelegation { * @param previousPage the previous page, this can be null. * @param control the delegation control for proceeding navigation process. */ - void showContent(Object page, HTMLElement container, ElementsBag elements, Object previousPage, - DelegationControl control); + void showContent(Object page, HTMLElement container, JsArray elements, + Object previousPage, DelegationControl control); /** * Called when the page is hiding its content (clearing the navigation container). @@ -46,6 +46,6 @@ void showContent(Object page, HTMLElement container, ElementsBag elements, Objec * @param nextPage potential next requested page, this can be null. * @param control the delegation control for proceeding navigation process. */ - void hideContent(Object page, HTMLElement container, ElementsBag elements, Object nextPage, - DelegationControl control); + void hideContent(Object page, HTMLElement container, JsArray elements, + Object nextPage, DelegationControl control); } diff --git a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/DefaultContentDelegation.java b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/DefaultContentDelegation.java index e1824430..8373de8f 100644 --- a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/DefaultContentDelegation.java +++ b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/DefaultContentDelegation.java @@ -14,13 +14,10 @@ package io.crysknife.ui.navigation.client.local; +import elemental2.core.JsArray; import elemental2.dom.HTMLElement; -import org.jboss.elemento.ElementsBag; import io.crysknife.ui.navigation.client.local.api.DelegationControl; -import static org.jboss.elemento.Elements.removeChildrenFrom; -import static org.jboss.elemento.Elements.wrapHtmlElement; - /** * Default content delegation procedure. * @@ -29,18 +26,26 @@ public class DefaultContentDelegation implements ContentDelegation { @Override - public void showContent(Object page, HTMLElement container, ElementsBag elements, + public void showContent(Object page, HTMLElement container, JsArray elements, Object previousPage, DelegationControl control) { if (container != null && elements != null) { - wrapHtmlElement(container).addAll(elements.elements()); + + elements.forEach((node, p1, p2) -> { + container.append(node); + return null; + }); } control.proceed(); } @Override - public void hideContent(Object page, HTMLElement container, ElementsBag elements, Object nextPage, - DelegationControl control) { - removeChildrenFrom(container); + public void hideContent(Object page, HTMLElement container, JsArray elements, + Object nextPage, DelegationControl control) { + if (container != null) { + while (container.firstChild != null) { + container.removeChild(container.firstChild); + } + } control.proceed(); } } diff --git a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/Navigation.java b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/Navigation.java index 3e2d54bb..c43478c8 100644 --- a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/Navigation.java +++ b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/Navigation.java @@ -14,24 +14,18 @@ package io.crysknife.ui.navigation.client.local; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Queue; +import java.util.*; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import elemental2.core.JsArray; import elemental2.dom.DomGlobal; import elemental2.dom.HTMLElement; import jsinterop.base.Js; import org.gwtproject.event.shared.HandlerRegistration; -import org.jboss.elemento.By; -import org.jboss.elemento.Elements; -import org.jboss.elemento.ElementsBag; -import org.jboss.elemento.IsElement; import io.crysknife.client.internal.collections.Multimap; import io.crysknife.ui.navigation.client.local.api.DelegationControl; import io.crysknife.ui.navigation.client.local.api.NavigationControl; @@ -44,7 +38,6 @@ import static elemental2.dom.DomGlobal.console; import static elemental2.dom.DomGlobal.document; -import static org.jboss.elemento.Elements.removeChildrenFrom; /** * Central control point for navigating between pages of the application. @@ -120,12 +113,12 @@ private static String getAppContextFromHostPage() { // @Inject // @NavigationSelector - private By navigationContainerSelector; + private String navigationContainerSelector; private HTMLElement navigationContainer; private PageNode currentNode; private Object currentPage; - private ElementsBag currentElements; + private JsArray currentElements; private HistoryToken currentToken; private ContentDelegation contentDelegation = new DefaultContentDelegation(); @@ -361,13 +354,18 @@ private

void hideCurrentPage(P requestPage, NavigationControl control) { requestPage, hideControl); } else { // Cannot call content delegation. The contract requests that currentPage != null! - removeChildrenFrom(navigationContainer); + if (navigationContainer != null) { + while (navigationContainer.firstChild != null) { + navigationContainer.removeChild(navigationContainer.firstChild); + } + } + hideControl.proceed(); } } } - private

void pageHiding(P page, ElementsBag pageElements, Request

request, + private

void pageHiding(P page, JsArray pageElements, Request

request, boolean fireEvent) { HTMLElement navigationContainer = navigationContainer(); if (navigationContainer != null) { @@ -408,17 +406,17 @@ && sameElements(navigationContainer, pageElements)) { } } - private boolean sameElements(HTMLElement navigationContainer, ElementsBag elements) { + private boolean sameElements(HTMLElement navigationContainer, JsArray elements) { int currentElementCount = (int) navigationContainer.childElementCount; int newElementsCount = 0; - for (HTMLElement ignored : elements.elements()) { + for (HTMLElement ignored : elements.asList()) { newElementsCount++; } if (currentElementCount != newElementsCount) { return false; } - Iterator currentIterator = Elements.iterator(navigationContainer); - Iterator newIterator = elements.elements().iterator(); + Iterator currentIterator = new JsArrayElementIterator(navigationContainer); + Iterator newIterator = elements.asList().iterator(); while (currentIterator.hasNext() && newIterator.hasNext()) { HTMLElement currentElement = currentIterator.next(); HTMLElement newElement = newIterator.next(); @@ -488,10 +486,10 @@ public void setContentDelegation(ContentDelegation contentDelegation) { this.contentDelegation = contentDelegation; } - public void setNavigationContainerSelector(By selector) { + public void setNavigationContainerSelector(String selector) { this.navigationContainerSelector = selector; if (selector != null) { - this.navigationContainer = Elements.find(document.body, navigationContainerSelector); + document.body.querySelector(navigationContainerSelector); } } @@ -524,7 +522,7 @@ private HTMLElement navigationContainer() { return navigationContainer; } if (navigationContainerSelector != null) { - navigationContainer = Elements.find(document.body, navigationContainerSelector); + navigationContainer = (HTMLElement) document.body.querySelector(navigationContainerSelector); } if (navigationContainer == null) { console.warn( @@ -538,21 +536,17 @@ private HTMLElement navigationContainer() { } @SuppressWarnings("rawtypes") - private ElementsBag pageElements(Object page) { - ElementsBag elements = new ElementsBag(); + private JsArray pageElements(Object page) { + JsArray elements = new JsArray<>(); if (page != null) { - if (page instanceof IsElement) { - elements.add(((IsElement) page).element()); - } else if (page instanceof io.crysknife.client.IsElement) { - elements.add(((io.crysknife.client.IsElement) page).getElement()); + if (page instanceof io.crysknife.client.IsElement) { + elements.push(((io.crysknife.client.IsElement) page).getElement()); } else if (page instanceof Iterable) { for (Object o : ((Iterable) page)) { - if (o instanceof IsElement) { - elements.add(((IsElement) o).element()); - } else if (page instanceof io.crysknife.client.IsElement) { - elements.add(((io.crysknife.client.IsElement) o).getElement()); + if (page instanceof io.crysknife.client.IsElement) { + elements.push(((io.crysknife.client.IsElement) o).getElement()); } else if (o instanceof HTMLElement) { - elements.add(((HTMLElement) o)); + elements.push(((HTMLElement) o)); } } } @@ -573,4 +567,39 @@ private Request(PageNode

pageNode, HistoryToken state) { this.state = state; } } + + private static class JsArrayElementIterator implements Iterator { + + private HTMLElement parent, last, next; + + public JsArrayElementIterator(HTMLElement parent) { + this.parent = parent; + next = (HTMLElement) parent.firstElementChild; + } + + @Override + public boolean hasNext() { + return next != null; + } + + @Override + public HTMLElement next() { + if (!hasNext()) { + throw new NoSuchElementException(); + } + last = next; + next = (HTMLElement) last.nextElementSibling; + return last; + } + + @Override + public void remove() { + if (last == null) { + throw new IllegalStateException(); + } + parent.removeChild(last); + last = null; + } + } + } diff --git a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/PageTransitionProvider.java b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/PageTransitionProvider.java index 9f4e1a5b..ae0bc436 100644 --- a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/PageTransitionProvider.java +++ b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/PageTransitionProvider.java @@ -14,11 +14,11 @@ package io.crysknife.ui.navigation.client.local; +import io.crysknife.client.IsElement; + import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.elemento.IsElement; - @Singleton public class PageTransitionProvider { diff --git a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/TransitionAnchorFactoryProvider.java b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/TransitionAnchorFactoryProvider.java index bc04bf48..77181ff3 100644 --- a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/TransitionAnchorFactoryProvider.java +++ b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/TransitionAnchorFactoryProvider.java @@ -14,11 +14,11 @@ package io.crysknife.ui.navigation.client.local; +import io.crysknife.client.IsElement; + import javax.inject.Inject; import javax.inject.Singleton; -import org.jboss.elemento.IsElement; - /** * Provides new instances of the {@link TransitionAnchorFactory} class, which allows them to be * injected. diff --git a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/spi/NavigationGraph.java b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/spi/NavigationGraph.java index 86506fd7..81d39f1b 100644 --- a/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/spi/NavigationGraph.java +++ b/ui/navigation/api/src/main/java/io/crysknife/ui/navigation/client/local/spi/NavigationGraph.java @@ -24,8 +24,8 @@ import javax.enterprise.event.Event; import javax.inject.Inject; +import io.crysknife.client.IsElement; import io.crysknife.client.utils.CreationalCallback; -import org.jboss.elemento.IsElement; import io.crysknife.client.BeanManager; import io.crysknife.client.internal.collections.Multimap; import io.crysknife.ui.navigation.client.local.PageRole; diff --git a/ui/navigation/generator/pom.xml b/ui/navigation/generator/pom.xml index 08f3b314..65d268a9 100644 --- a/ui/navigation/generator/pom.xml +++ b/ui/navigation/generator/pom.xml @@ -45,10 +45,6 @@ com.google.elemental2 elemental2-dom - - org.jboss.elemento - elemento-core - io.crysknife crysknife-processor diff --git a/ui/navigation/generator/src/main/java/io/crysknife/ui/navigation/generator/NavigationGraphGenerator.java b/ui/navigation/generator/src/main/java/io/crysknife/ui/navigation/generator/NavigationGraphGenerator.java index 0bd61656..d0ae6e5a 100644 --- a/ui/navigation/generator/src/main/java/io/crysknife/ui/navigation/generator/NavigationGraphGenerator.java +++ b/ui/navigation/generator/src/main/java/io/crysknife/ui/navigation/generator/NavigationGraphGenerator.java @@ -50,8 +50,8 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.google.auto.common.MoreElements; +import io.crysknife.client.IsElement; import io.crysknife.client.utils.CreationalCallback; -import org.jboss.elemento.IsElement; import io.crysknife.client.BeanManager; import io.crysknife.client.internal.collections.BiMap; import io.crysknife.exception.GenerationException; @@ -161,8 +161,7 @@ protected void build(String fileName, String source, GenerationContext context) } private void generatePage(TypeElement page, ConstructorDeclaration ctor) { - if (!(isAssignable(page.asType(), IsElement.class) - || isAssignable(page.asType(), io.crysknife.client.IsElement.class))) { + if (!(isAssignable(page.asType(), IsElement.class))) { throw new GenerationException("Class " + page + " is annotated with @Page, so it must implement org.jboss.elemento.IsElement or io.crysknife.client.IsElement"); } diff --git a/ui/templates/api/pom.xml b/ui/templates/api/pom.xml index 4a78bf5d..51240c56 100644 --- a/ui/templates/api/pom.xml +++ b/ui/templates/api/pom.xml @@ -44,16 +44,6 @@ com.google.elemental2 elemental2-dom - - org.jboss.elemento - elemento-core - - - org.junit.jupiter - junit-jupiter - - - org.gwtproject.event gwt-event-dom diff --git a/ui/templates/api/src/main/java/io/crysknife/ui/templates/client/TemplateUtil.java b/ui/templates/api/src/main/java/io/crysknife/ui/templates/client/TemplateUtil.java index 9719aea9..68d9ddff 100644 --- a/ui/templates/api/src/main/java/io/crysknife/ui/templates/client/TemplateUtil.java +++ b/ui/templates/api/src/main/java/io/crysknife/ui/templates/client/TemplateUtil.java @@ -24,10 +24,10 @@ import elemental2.dom.Node; import elemental2.dom.NodeFilter; import elemental2.dom.TreeWalker; +import io.crysknife.client.IsElement; import jsinterop.base.Js; import org.gwtproject.safehtml.shared.SafeHtml; import org.gwtproject.safehtml.shared.SafeHtmlUtils; -import org.jboss.elemento.IsElement; /** * Static helper methods used from code generated by {@code @Templated} annotation processors. You @@ -56,11 +56,6 @@ public static E resolveElementAs(HTMLElement context, St return htmlElement; } - public static void replaceIsElement(HTMLElement context, String identifier, - IsElement newElement) { - replaceElement(context, identifier, newElement.element()); - } - // ------------------------------------------------------ IsElement / (Is)Widget methods public static void replaceElement(HTMLElement context, String identifier, diff --git a/ui/templates/api/src/main/resources/io/crysknife/ui/templates/Template.gwt.xml b/ui/templates/api/src/main/resources/io/crysknife/ui/templates/Template.gwt.xml index 76848449..4d660be9 100644 --- a/ui/templates/api/src/main/resources/io/crysknife/ui/templates/Template.gwt.xml +++ b/ui/templates/api/src/main/resources/io/crysknife/ui/templates/Template.gwt.xml @@ -1,7 +1,6 @@ - \ No newline at end of file diff --git a/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGenerator.java b/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGenerator.java index 5738ecd4..42fa58bd 100644 --- a/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGenerator.java +++ b/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGenerator.java @@ -33,6 +33,7 @@ import com.inet.lib.less.Less; import elemental2.dom.*; import io.crysknife.annotation.Generator; +import io.crysknife.client.IsElement; import io.crysknife.client.Reflect; import io.crysknife.definition.BeanDefinition; import io.crysknife.definition.InjectionParameterDefinition; @@ -53,7 +54,6 @@ import io.crysknife.util.Utils; import jsinterop.base.Js; import org.apache.commons.io.IOUtils; -import org.jboss.elemento.IsElement; import org.jboss.gwt.elemento.processor.*; import org.jboss.gwt.elemento.processor.context.StyleSheet; import org.jboss.gwt.elemento.processor.context.*; @@ -634,12 +634,7 @@ public MethodCallExpr getFieldAccessCallExpr(VariableElement field) { // TODO this method must be refactored public Expression getInstanceByElementKind(DataElementInfo element, Expression instance) { - if (element.getKind().equals(DataElementInfo.Kind.ElementoIsElement)) { - instance = new MethodCallExpr( - new EnclosedExpr(new CastExpr( - new ClassOrInterfaceType().setName(IsElement.class.getCanonicalName()), instance)), - "element"); - } else if (element.getKind().equals(DataElementInfo.Kind.CrysknifeIsElement)) { + if (element.getKind().equals(DataElementInfo.Kind.IsElement)) { instance = new MethodCallExpr( new EnclosedExpr(new CastExpr(new ClassOrInterfaceType() .setName(io.crysknife.client.IsElement.class.getCanonicalName()), instance)), @@ -946,9 +941,7 @@ private void validateType(TypeElement type, Templated templated) { || templatedGeneratorUtils.isAssignable(type, io.crysknife.client.IsElement.class) || templatedGeneratorUtils.maybeGwtWidget(type.asType()))) { abortWithError(type, "%s must implement %s", type.getQualifiedName(), - (IsElement.class.getCanonicalName() + " or " - + io.crysknife.client.IsElement.class.getCanonicalName() + " or " - + templatedGeneratorUtils.isWidgetType)); + (IsElement.class.getCanonicalName() + " or " + templatedGeneratorUtils.isWidgetType)); } } diff --git a/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGeneratorUtils.java b/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGeneratorUtils.java index a8d6eaef..b68efc1c 100644 --- a/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGeneratorUtils.java +++ b/ui/templates/generator/src/main/java/io/crysknife/ui/templates/generator/TemplatedGeneratorUtils.java @@ -21,7 +21,6 @@ import io.crysknife.exception.GenerationException; import io.crysknife.generator.context.IOCContext; import jsinterop.base.Js; -import org.jboss.elemento.IsElement; import org.jboss.gwt.elemento.processor.context.DataElementInfo; import org.jboss.gwt.elemento.processor.context.TemplateContext; @@ -63,10 +62,7 @@ public boolean maybeGwtDom(TypeMirror dataElementType) { } public String getMethodName(DataElementInfo.Kind kind) { - if (kind.equals(DataElementInfo.Kind.ElementoIsElement) - || kind.equals(DataElementInfo.Kind.HTMLElement)) { - return "element"; - } else if (kind.equals(DataElementInfo.Kind.CrysknifeIsElement)) { + if (kind.equals(DataElementInfo.Kind.IsElement)) { return "getElement"; } else if (kind.equals(DataElementInfo.Kind.IsWidget)) { return "getIsWidgetElement"; @@ -105,9 +101,7 @@ public DataElementInfo.Kind getDataElementInfoKind(TypeMirror dataElementType) { if (isAssignable(dataElementType, HTMLElement.class)) { return DataElementInfo.Kind.HTMLElement; } else if (isAssignable(dataElementType, io.crysknife.client.IsElement.class)) { - return DataElementInfo.Kind.CrysknifeIsElement; - } else if (isAssignable(dataElementType, IsElement.class)) { - return DataElementInfo.Kind.ElementoIsElement; + return DataElementInfo.Kind.IsElement; } else if (maybeGwtWidget(dataElementType)) { return DataElementInfo.Kind.IsWidget; } else if (maybeGwtDom(dataElementType)) { diff --git a/ui/templates/generator/src/main/java/org/jboss/gwt/elemento/processor/context/DataElementInfo.java b/ui/templates/generator/src/main/java/org/jboss/gwt/elemento/processor/context/DataElementInfo.java index 1e147277..acd14509 100644 --- a/ui/templates/generator/src/main/java/org/jboss/gwt/elemento/processor/context/DataElementInfo.java +++ b/ui/templates/generator/src/main/java/org/jboss/gwt/elemento/processor/context/DataElementInfo.java @@ -21,7 +21,7 @@ public class DataElementInfo { public enum Kind { // Name them after the related type for nicer error messages - HTMLElement, CrysknifeIsElement, ElementoIsElement, IsWidget, Custom, GWT_DOM + HTMLElement, IsElement, IsWidget, Custom, GWT_DOM } private final String type;