This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit 91600f2af802b04a83fefded788a05910e6ba4f3 Author: Andi Huber <[email protected]> AuthorDate: Thu Aug 13 12:36:00 2020 +0200 ISIS-2340: move BindingConverter to UI Commons --- .../apache/isis/incubator/viewer/javafx/model/binding/BindingsFx.java | 1 + .../incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java | 2 +- .../incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java | 2 +- .../viewer/javafx/ui/components/markup/MarkupFieldFactory.java | 2 +- .../incubator/viewer/javafx/ui/components/object/ObjectViewFx.java | 2 +- .../javafx/ui/components/objectref/ObjectReferenceFieldFactory.java | 2 +- .../viewer/javafx/ui/components/other/FallbackFieldFactory.java | 2 +- .../incubator/viewer/javafx/ui/components/text/TextFieldFactory.java | 4 ++-- .../apache/isis/incubator/viewer/javafx/ui/main/UiActionHandler.java | 2 +- .../apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java | 2 +- .../incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java | 2 +- .../incubator/viewer/vaadin/ui/components/UiComponentHandlerVaa.java | 2 +- .../incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java | 2 +- .../incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java | 2 +- .../viewer/vaadin/ui/components/markup/MarkupFieldFactory.java | 2 +- .../incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java | 2 +- .../viewer/vaadin/ui/components/other/FallbackFieldFactory.java | 2 +- .../viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java | 2 +- .../incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java | 2 +- .../viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java | 2 +- .../asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java | 2 +- .../apache/isis/viewer/common}/model/binding/BindingConverter.java | 2 +- .../common/model/{binding => components}/UiComponentFactory.java | 2 +- 23 files changed, 24 insertions(+), 23 deletions(-) diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/binding/BindingsFx.java b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/binding/BindingsFx.java index 0fd6c61..34be960 100644 --- a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/binding/BindingsFx.java +++ b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/binding/BindingsFx.java @@ -26,6 +26,7 @@ import org.apache.isis.core.commons.binding.ChangeListener; import org.apache.isis.core.commons.binding.Observable; import org.apache.isis.core.commons.internal.exceptions._Exceptions; import org.apache.isis.core.metamodel.spec.ManagedObject; +import org.apache.isis.viewer.common.model.binding.BindingConverter; import javafx.beans.property.Property; import javafx.beans.value.ObservableValue; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java index 63b5621..9e4c6e6 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java @@ -32,7 +32,7 @@ import org.apache.isis.core.commons.internal.exceptions._Exceptions; import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet; import org.apache.isis.core.metamodel.interactions.managed.ManagedMember; import org.apache.isis.incubator.viewer.javafx.model.context.UiContext; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory; +import org.apache.isis.viewer.common.model.components.UiComponentFactory; import org.apache.isis.viewer.common.model.decorator.prototyping.PrototypingUiModel; import lombok.Getter; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java index 0c82431..fd875bf 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/UiComponentHandlerFx.java @@ -18,7 +18,7 @@ */ package org.apache.isis.incubator.viewer.javafx.ui.components; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory; +import org.apache.isis.viewer.common.model.components.UiComponentFactory; import javafx.scene.Node; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java index 0fb2aac..aa34c68 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java @@ -30,7 +30,7 @@ import org.w3c.dom.html.HTMLAnchorElement; import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.applib.value.HasHtml; import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentHandlerFx; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java index 12f0200..abe3dc0 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/object/ObjectViewFx.java @@ -44,7 +44,7 @@ import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentFactoryF import org.apache.isis.incubator.viewer.javafx.ui.components.collections.TableViewFx; import org.apache.isis.incubator.viewer.javafx.ui.components.form.FormPane; import org.apache.isis.incubator.viewer.javafx.ui.components.panel.TitledPanel; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory; +import org.apache.isis.viewer.common.model.components.UiComponentFactory; import org.apache.isis.viewer.common.model.decorator.disable.DisablingUiModel; import org.apache.isis.viewer.common.model.gridlayout.UiGridLayout; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java index 29023c9..989f7de 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/objectref/ObjectReferenceFieldFactory.java @@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.core.metamodel.interactions.managed.ManagedParameter; import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty; import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentHandlerFx; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java index 9777479..40f8052 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/other/FallbackFieldFactory.java @@ -22,7 +22,7 @@ import org.springframework.core.annotation.Order; import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentHandlerFx; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java index 9fc6cad..7a57f5a 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/text/TextFieldFactory.java @@ -27,10 +27,10 @@ import org.apache.isis.core.metamodel.facets.value.string.StringValueFacet; import org.apache.isis.core.metamodel.interactions.managed.ManagedParameter; import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.incubator.viewer.javafx.model.binding.BindingConverter; import org.apache.isis.incubator.viewer.javafx.model.binding.BindingsFx; import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentHandlerFx; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.binding.BindingConverter; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import javafx.scene.Node; import javafx.scene.control.TextField; diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandler.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandler.java index ff7d943..a6749ab 100644 --- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandler.java +++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandler.java @@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject; import org.apache.isis.core.runtime.iactn.IsisInteractionFactory; import org.apache.isis.incubator.viewer.javafx.model.context.UiContext; import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentFactoryFx; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java index e79f1f3..45f4a5b 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BinderUtil.java @@ -31,7 +31,7 @@ import com.vaadin.flow.data.converter.DateToSqlDateConverter; import com.vaadin.flow.data.converter.LocalDateToDateConverter; import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java index d93abe6..253b4a9 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentFactoryVaa.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Service; import org.apache.isis.core.commons.handler.ChainOfResponsibility; import org.apache.isis.core.commons.internal.exceptions._Exceptions; import org.apache.isis.incubator.viewer.vaadin.model.util._vaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory; +import org.apache.isis.viewer.common.model.components.UiComponentFactory; import lombok.Getter; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentHandlerVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentHandlerVaa.java index 44c36e1..abb6489 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentHandlerVaa.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/UiComponentHandlerVaa.java @@ -20,7 +20,7 @@ package org.apache.isis.incubator.viewer.vaadin.ui.components; import com.vaadin.flow.component.Component; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory; +import org.apache.isis.viewer.common.model.components.UiComponentFactory; public interface UiComponentHandlerVaa extends UiComponentFactory.Handler<Component> { diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java index 3b2bc91..f958f27 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/blob/BlobFieldFactory.java @@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.applib.value.Blob; import org.apache.isis.core.metamodel.facets.value.blobs.BlobValueFacet; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java index 708b770..4969d8c 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/clob/ClobFieldFactory.java @@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.applib.value.Clob; import org.apache.isis.core.metamodel.facets.value.clobs.ClobValueFacet; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java index 9585322..540c766 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/markup/MarkupFieldFactory.java @@ -24,7 +24,7 @@ import org.springframework.core.annotation.Order; import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java index 87a496e..748c371 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java @@ -51,7 +51,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObjects; import org.apache.isis.incubator.viewer.vaadin.model.util._vaa; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa; import org.apache.isis.incubator.viewer.vaadin.ui.components.collection.TableViewVaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory; +import org.apache.isis.viewer.common.model.components.UiComponentFactory; import org.apache.isis.viewer.common.model.decorator.disable.DisablingUiModel; import org.apache.isis.viewer.common.model.gridlayout.UiGridLayout; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java index ff42589..7f56b30 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/other/FallbackFieldFactory.java @@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; import org.apache.isis.incubator.viewer.vaadin.ui.components.debug.DebugField; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import org.apache.isis.viewer.common.model.debug.DebugUiModel; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java index 1244c31..5af64a8 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/temporal/TemporalFieldFactory.java @@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.facets.value.temporal.TemporalValueFacet.O import org.apache.isis.core.metamodel.facets.value.temporal.TemporalValueFacet.TemporalCharacteristic; import org.apache.isis.incubator.viewer.vaadin.ui.binding.BinderUtil; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java index 2551cfc..735b43f 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/TextFieldFactory.java @@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.core.metamodel.facets.value.string.StringValueFacet; import org.apache.isis.incubator.viewer.vaadin.ui.binding.BinderUtil; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java index 53f7a7d..aa58a55 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/text/uuid/UuidFieldFactory.java @@ -31,7 +31,7 @@ import org.springframework.core.annotation.Order; import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.incubator.viewer.vaadin.ui.binding.BinderUtil; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java index 667d56f..ac9fafa 100644 --- a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java +++ b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java @@ -25,7 +25,7 @@ import org.springframework.core.annotation.Order; import org.apache.isis.applib.annotation.OrderPrecedence; import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentHandlerVaa; import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc; -import org.apache.isis.viewer.common.model.binding.UiComponentFactory.ComponentRequest; +import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest; import lombok.val; diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/binding/BindingConverter.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverter.java similarity index 95% rename from incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/binding/BindingConverter.java rename to viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverter.java index d63b867..ef1054c 100644 --- a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/binding/BindingConverter.java +++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.incubator.viewer.javafx.model.binding; +package org.apache.isis.viewer.common.model.binding; import org.apache.isis.core.commons.internal.base._Casts; import org.apache.isis.core.metamodel.spec.ManagedObject; diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/UiComponentFactory.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java similarity index 99% rename from viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/UiComponentFactory.java rename to viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java index 93c8425..40e7e8b 100644 --- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/UiComponentFactory.java +++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.viewer.common.model.binding; +package org.apache.isis.viewer.common.model.components; import java.util.Optional; import java.util.function.Consumer;
