You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/07/30 07:16:23 UTC

[isis] branch master updated (be778712d0 -> c6e4e1d41c)

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


    from be778712d0 ISIS-3099: restructure artifact 'viewer-common' into 'viewer-commons/modle'
     add c6e4e1d41c ISIS-3099: moves Prism from 'valuetypes' to 'viewer-commons'

No new revisions were added by this update.

Summary of changes:
 .../modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc | 16 +++++++++++
 .../common/ui/custom/WhereInTheWorldPanel.java     |  4 +--
 .../ui/custom/WhereInTheWorldPanelFactory.java     |  2 +-
 .../CollectionContentsAsExcelFactory.java          |  2 +-
 .../CalendaredCollectionFactoryAbstract.java       |  2 +-
 .../PdfJsViewerPanelComponentFactory.java          |  2 +-
 .../javafx/model/action/ActionUiModelFx.java       |  2 +-
 .../viewer/javafx/model/binding/BindingsFx.java    |  2 +-
 .../viewer/javafx/model/context/UiContextFx.java   |  6 ++--
 .../viewer/javafx/model/icon/IconService.java      |  2 +-
 .../javafx/ui/IsisModuleIncViewerJavaFxUi.java     |  2 +-
 .../javafx/ui/components/UiComponentFactoryFx.java |  4 +--
 .../javafx/ui/components/UiComponentHandlerFx.java |  4 +--
 .../ui/components/markup/MarkupFieldFactory.java   |  2 +-
 .../ui/components/number/NumberFieldFactory.java   |  2 +-
 .../javafx/ui/components/object/ObjectViewFx.java  |  6 ++--
 .../objectref/ObjectReferenceFieldFactory.java     |  2 +-
 .../ui/components/other/FallbackFieldFactory.java  |  2 +-
 .../components/temporal/TemporalFieldFactory.java  |  4 +--
 .../ui/components/text/TextFieldFactory.java       |  2 +-
 .../disabling/DisablingDecoratorForButton.java     |  2 +-
 .../disabling/DisablingDecoratorForFormField.java  |  2 +-
 .../ui/decorator/icon/IconDecoratorForLabeled.java |  2 +-
 .../decorator/icon/IconDecoratorForMenuItem.java   |  2 +-
 .../ui/decorator/icon/IconServiceDefault.java      |  2 +-
 .../prototyping/PrototypingDecoratorForButton.java |  2 +-
 .../PrototypingDecoratorForFormField.java          |  2 +-
 .../prototyping/PrototypingInfoPopupProvider.java  |  2 +-
 .../viewer/javafx/ui/main/MainViewFx.java          |  2 +-
 .../viewer/javafx/ui/main/MenuBuilderFx.java       |  4 +--
 .../viewer/javafx/ui/main/UiActionHandlerFx.java   |  2 +-
 .../viewer/javafx/ui/main/UiContextFxDefault.java  |  6 ++--
 .../vaadin/model/action/ActionUiModelVaa.java      |  2 +-
 .../viewer/vaadin/model/decorator/Decorators.java  |  8 +++---
 incubator/viewers/vaadin/ui/pom.xml                |  6 ++--
 .../vaadin/ui/IsisModuleIncViewerVaadinUi.java     |  2 +-
 .../ui/components/UiComponentFactoryVaa.java       |  2 +-
 .../ui/components/UiComponentHandlerVaa.java       |  2 +-
 .../vaadin/ui/components/action/ActionForm.java    |  2 +-
 .../ui/components/blob/BlobFieldFactory.java       |  2 +-
 .../ui/components/clob/ClobFieldFactory.java       |  2 +-
 .../vaadin/ui/components/debug/DebugField.java     |  2 +-
 .../ui/components/markup/MarkupFieldFactory.java   |  2 +-
 .../vaadin/ui/components/object/ObjectViewVaa.java |  6 ++--
 .../ui/components/other/FallbackFieldFactory.java  |  4 +--
 .../components/temporal/TemporalFieldFactory.java  |  2 +-
 .../ui/components/text/TextFieldFactory.java       |  2 +-
 .../ui/components/text/uuid/UuidFieldFactory.java  |  2 +-
 .../viewer/vaadin/ui/pages/main/MainViewVaa.java   |  4 +--
 .../ui/pages/main/MainView_createHeader.java       |  4 +--
 .../vaadin/ui/pages/main/MenuBuilderVaa.java       |  4 +--
 .../viewer/vaadin/ui/util/PrismResourcesVaa.java   |  2 +-
 .../viewers/common/wkt/InteractionTestWkt.java     |  4 +--
 valuetypes/asciidoc/ui/pom.xml                     |  7 -----
 .../ui/vaa/components/AsciiDocFieldFactoryVaa.java |  2 +-
 valuetypes/pom.xml                                 |  1 -
 valuetypes/prism/pom.xml                           | 33 ----------------------
 .../applib/mixins/Object_impersonate.java          |  2 +-
 .../applib/mixins/Object_impersonateWithRoles.java |  2 +-
 .../services/userprof/UserProfileUiModel.java      |  2 +-
 .../userprof/UserProfileUiModelProvider.java       |  2 +-
 .../model/HasParentUiModel.java                    |  4 +--
 .../model/IsisModuleViewerCommon.java              | 14 ++++-----
 .../model/PlacementDirection.java                  |  2 +-
 .../model/StringForRendering.java                  |  2 +-
 .../model/UiComponentHolder.java                   |  4 +--
 .../model/action/ActionFormUiModel.java            |  6 ++--
 .../model/action/ActionUiModel.java                |  2 +-
 .../model/action/HasActionInteraction.java         |  2 +-
 .../model/action/HasManagedAction.java             |  6 ++--
 .../model/action/decorator/ActionUiDecorator.java  | 12 ++++----
 .../model/binding/BindingConverter.java            |  2 +-
 .../binding/BindingConverterForManagedObject.java  |  2 +-
 .../model/branding/BrandingUiModel.java            |  2 +-
 .../model/branding/BrandingUiModelProvider.java    |  2 +-
 .../model/components/ComponentType.java            |  2 +-
 .../model/components/UiComponentFactory.java       |  4 +--
 .../model/debug/DebugUiModel.java                  |  2 +-
 .../model/decorators/ConfirmDecorator.java         |  4 +--
 .../model/decorators/DangerDecorator.java          |  2 +-
 .../model/decorators/DisablingDecorator.java       |  2 +-
 .../model/decorators/FormLabelDecorator.java       |  2 +-
 .../model/decorators/IconDecorator.java            |  2 +-
 .../model/decorators/PrototypingDecorator.java     |  2 +-
 .../model/decorators/TooltipDecorator.java         |  4 +--
 .../model/feature/ParameterUiModel.java            |  2 +-
 .../model/feature/PropertyUiModel.java             |  2 +-
 .../model/feature/ScalarUiModel.java               |  2 +-
 .../model/gridlayout/UiGridLayout.java             |  2 +-
 .../model/header/HeaderUiModel.java                |  8 +++---
 .../model/header/HeaderUiModelProvider.java        |  8 +++---
 .../model/menu/MenuItemDto.java                    |  2 +-
 .../model/menu/MenuUiModel.java                    |  2 +-
 .../model/menu/MenuUiModelProvider.java            |  2 +-
 .../model/menu/MenuUiModel_buildMenuItems.java     |  4 +--
 .../model/menu/MenuVisitor.java                    |  2 +-
 .../{common => commons}/model/mixin/HasTitle.java  |  2 +-
 .../model/mixin/HasUiComponent.java                |  2 +-
 .../model/mixin/HasUiMenuItem.java                 |  2 +-
 .../model/object/ObjectUiModel.java                |  2 +-
 .../model/object/SimpleObjectUiModel.java          |  2 +-
 .../UserProfileUiModelProviderDefault.java         |  6 ++--
 viewers/commons/pom.xml                            |  1 +
 .../resources => viewers/commons/prism}/pom.xml    | 13 +++++----
 .../apache/isis/viewer/commons}/prism/Prism.java   |  2 +-
 .../isis/viewer/commons}/prism/PrismLanguage.java  |  2 +-
 .../IsisModuleViewerRestfulObjectsViewer.java      |  2 +-
 .../viewer/resources/HomePageReprRenderer.java     |  2 +-
 .../viewer/wicket/model/links/LinkAndLabel.java    |  4 +--
 .../viewer/wicket/model/models/ActionModel.java    |  2 +-
 .../wicket/model/models/BookmarkableModel.java     |  2 +-
 .../wicket/model/models/ChainingObjectModel.java   |  2 +-
 .../viewer/wicket/model/models/EntityModel.java    |  4 +--
 .../wicket/model/models/FormExecutorContext.java   |  2 +-
 .../wicket/model/models/ObjectAdapterModel.java    |  4 +--
 .../viewer/wicket/model/models/ScalarModel.java    |  8 +++---
 .../wicket/model/models/ScalarParameterModel.java  |  2 +-
 .../wicket/model/models/ScalarPropertyModel.java   |  2 +-
 .../wicket/model/models/ServiceActionsModel.java   |  2 +-
 .../model/models/interaction/ObjectUiModelWkt.java |  2 +-
 .../interaction/act/ParameterUiModelWkt.java       |  4 +--
 .../models/interaction/coll/DataTableModelWkt.java |  2 +-
 .../interaction/prop/PropertyUiModelWkt.java       |  4 +--
 viewers/wicket/ui/pom.xml                          |  4 +--
 .../isis/viewer/wicket/ui/ComponentFactory.java    |  2 +-
 .../viewer/wicket/ui/ComponentFactoryAbstract.java |  2 +-
 .../viewer/wicket/ui/IsisModuleViewerWicketUi.java |  2 +-
 .../ui/app/registry/ComponentFactoryRegistrar.java |  2 +-
 .../ui/app/registry/ComponentFactoryRegistry.java  |  2 +-
 .../ui/components/about/AboutPanelFactory.java     |  2 +-
 .../actioninfo/ActionInfoPanelFactory.java         |  2 +-
 .../components/actionmenu/CssClassFaBehavior.java  |  2 +-
 .../serviceactions/ServiceActionUtil.java          |  6 ++--
 .../serviceactions/ServiceActionsPanelFactory.java |  2 +-
 .../serviceactions/TertiaryMenuPanelFactory.java   |  2 +-
 .../actionprompt/ActionPromptHeaderPanel.java      |  2 +-
 .../components/actions/ActionParametersForm.java   |  8 +++---
 .../actions/ActionParametersFormPanelFactory.java  |  2 +-
 .../components/actions/ActionParametersPanel.java  |  2 +-
 .../actions/ActionParametersPanelFactory.java      |  2 +-
 .../BookmarkedPagesPanelFactory.java               |  2 +-
 .../ui/components/collection/CollectionPanel.java  |  2 +-
 .../CollectionPresentationSelectorHelper.java      |  2 +-
 .../CollectionPresentationSelectorPanel.java       |  6 ++--
 .../CollectionContentsAsAjaxTablePanelFactory.java |  2 +-
 .../ajaxtable/columns/GenericColumnAbstract.java   |  2 +-
 .../ajaxtable/columns/GenericPropertyColumn.java   |  2 +-
 .../ajaxtable/columns/GenericTitleColumn.java      |  4 +--
 .../CollectionContentsAsIconsPanelFactory.java     |  2 +-
 .../CollectionContentsMultipleViewsPanel.java      |  2 +-
 ...ollectionContentsMultipleViewsPanelFactory.java |  2 +-
 .../CollectionContentsAsSummaryFactory.java        |  2 +-
 .../CollectionContentsHiddenPanelFactory.java      |  2 +-
 .../empty/EmptyCollectionPanelFactory.java         |  2 +-
 .../entity/EntityComponentFactoryAbstract.java     |  2 +-
 .../collection/EntityCollectionPanelFactory.java   |  2 +-
 .../components/entity/fieldset/PropertyGroup.java  |  2 +-
 .../entity/header/EntityHeaderPanel.java           |  2 +-
 .../entity/header/EntityHeaderPanelFactory.java    |  2 +-
 .../icontitle/EntityIconAndTitlePanelFactory.java  |  2 +-
 .../EntityIconTitleAndCopyLinkPanelFactory.java    |  2 +-
 .../ui/components/footer/FooterPanelFactory.java   |  2 +-
 .../wicket/ui/components/header/HeaderPanel.java   | 10 +++----
 .../ui/components/header/HeaderPanelFactory.java   |  2 +-
 .../components/layout/bs/BSGridPanelFactory.java   |  2 +-
 .../wicket/ui/components/layout/bs/col/Col.java    |  2 +-
 .../ui/components/property/PropertyEditForm.java   |  2 +-
 .../property/PropertyEditFormPanelFactory.java     |  2 +-
 .../ui/components/property/PropertyEditPanel.java  |  2 +-
 .../property/PropertyEditPanelFactory.java         |  2 +-
 .../PropertyEditPromptHeaderPanel.java             |  2 +-
 .../scalars/ComponentFactoryScalarAbstract.java    |  2 +-
 .../ui/components/scalars/ScalarPanelAbstract.java |  6 ++--
 .../components/scalars/ScalarPanelAbstract2.java   |  2 +-
 .../scalars/ScalarPanelSelectAbstract.java         |  2 +-
 .../scalars/ScalarPanelTextFieldAbstract.java      |  2 +-
 .../blobclob/IsisBlobOrClobPanelAbstract.java      |  2 +-
 .../ui/components/scalars/bool/BooleanPanel.java   |  2 +-
 .../scalars/image/JavaAwtImagePanel.java           |  2 +-
 .../scalars/image/JavaAwtImagePanelFactory.java    |  2 +-
 .../components/scalars/markup/MarkupComponent.java |  2 +-
 .../scalars/markup/MarkupPanelFactories.java       |  2 +-
 .../scalars/reference/ReferencePanel.java          |  4 +--
 .../scalars/reference/ReferencePanelFactory.java   |  2 +-
 .../valuechoices/ValueChoicesSelect2Panel.java     |  2 +-
 .../ValueChoicesSelect2PanelFactory.java           |  2 +-
 .../StandaloneCollectionPanel.java                 |  2 +-
 .../StandaloneCollectionPanelFactory.java          |  2 +-
 .../ui/components/tree/TreePanelFactories.java     |  2 +-
 .../unknown/UnknownModelPanelFactory.java          |  2 +-
 .../value/StandaloneValuePanelFactory.java         |  2 +-
 .../voidreturn/VoidReturnPanelFactory.java         |  2 +-
 .../ui/components/welcome/WelcomePanelFactory.java |  2 +-
 .../entitysimplelink/EntityLinkSimplePanel.java    |  2 +-
 .../EntityLinkSimplePanelFactory.java              |  2 +-
 .../formcomponent/FormComponentPanelAbstract.java  |  2 +-
 .../widgets/linkandlabel/ActionLink.java           |  2 +-
 .../ui/components/widgets/navbar/AvatarImage.java  |  2 +-
 .../ui/components/widgets/navbar/BrandLogo.java    |  2 +-
 .../ui/components/widgets/navbar/BrandName.java    |  2 +-
 ...derForReferenceParamOrPropertyAutoComplete.java |  2 +-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  4 +--
 .../viewer/wicket/ui/pages/about/AboutPage.java    |  2 +-
 .../accmngt/AccountManagementPageAbstract.java     |  2 +-
 .../fontawesome/FontAwesomeCssReferenceWkt.java    |  2 +-
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |  2 +-
 .../isis/viewer/wicket/ui/pages/home/HomePage.java |  2 +-
 .../StandaloneCollectionPage.java                  |  2 +-
 .../viewer/wicket/ui/pages/value/ValuePage.java    |  2 +-
 .../wicket/ui/pages/voidreturn/VoidReturnPage.java |  2 +-
 .../viewer/wicket/ui/panels/PanelAbstract.java     |  2 +-
 .../isis/viewer/wicket/ui/panels/PanelBase.java    |  4 +--
 .../viewer/wicket/ui/util/PrismResourcesWkt.java   |  4 +--
 .../org/apache/isis/viewer/wicket/ui/util/Wkt.java |  2 +-
 .../isis/viewer/wicket/ui/util/WktComponents.java  |  2 +-
 .../isis/viewer/wicket/ui/util/WktDecorators.java  | 24 ++++++++--------
 .../isis/viewer/wicket/ui/util/WktLinks.java       |  4 +--
 .../isis/viewer/wicket/ui/util/WktTooltips.java    |  4 +--
 .../wicket/ui/ComponentType_ConstantsTest.java     |  5 ++--
 .../ComponentFactoryRegistryDefault.java           |  2 +-
 .../ComponentFactoryRegistryDefaultTest.java       |  2 +-
 221 files changed, 332 insertions(+), 356 deletions(-)
 delete mode 100644 valuetypes/prism/pom.xml
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/applib/mixins/Object_impersonate.java (98%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/applib/mixins/Object_impersonateWithRoles.java (98%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/applib/services/userprof/UserProfileUiModel.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/applib/services/userprof/UserProfileUiModelProvider.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/HasParentUiModel.java (91%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/IsisModuleViewerCommon.java (71%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/PlacementDirection.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/StringForRendering.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/UiComponentHolder.java (91%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/action/ActionFormUiModel.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/action/ActionUiModel.java (94%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/action/HasActionInteraction.java (96%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/action/HasManagedAction.java (94%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/action/decorator/ActionUiDecorator.java (76%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/binding/BindingConverter.java (96%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/binding/BindingConverterForManagedObject.java (96%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/branding/BrandingUiModel.java (96%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/branding/BrandingUiModelProvider.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/components/ComponentType.java (98%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/components/UiComponentFactory.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/debug/DebugUiModel.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/decorators/ConfirmDecorator.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/decorators/DangerDecorator.java (94%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/decorators/DisablingDecorator.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/decorators/FormLabelDecorator.java (96%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/decorators/IconDecorator.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/decorators/PrototypingDecorator.java (98%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/decorators/TooltipDecorator.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/feature/ParameterUiModel.java (98%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/feature/PropertyUiModel.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/feature/ScalarUiModel.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/gridlayout/UiGridLayout.java (99%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/header/HeaderUiModel.java (81%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/header/HeaderUiModelProvider.java (84%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/menu/MenuItemDto.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/menu/MenuUiModel.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/menu/MenuUiModelProvider.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/menu/MenuUiModel_buildMenuItems.java (97%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/menu/MenuVisitor.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/mixin/HasTitle.java (94%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/mixin/HasUiComponent.java (94%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/mixin/HasUiMenuItem.java (94%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/object/ObjectUiModel.java (98%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/object/SimpleObjectUiModel.java (95%)
 rename viewers/commons/model/src/main/java/org/apache/isis/viewer/{common => commons}/model/userprofile/UserProfileUiModelProviderDefault.java (92%)
 rename {valuetypes/prism/resources => viewers/commons/prism}/pom.xml (75%)
 rename {valuetypes/prism/resources/src/main/java/org/apache/isis/valuetypes => viewers/commons/prism/src/main/java/org/apache/isis/viewer/commons}/prism/Prism.java (96%)
 rename {valuetypes/prism/resources/src/main/java/org/apache/isis/valuetypes => viewers/commons/prism/src/main/java/org/apache/isis/viewer/commons}/prism/PrismLanguage.java (96%)