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/09/15 11:43:02 UTC
[isis] branch master updated: ISIS-3198: move rendering hinting into their own package
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
The following commit(s) were added to refs/heads/master by this push:
new 3ae96c3b83 ISIS-3198: move rendering hinting into their own package
3ae96c3b83 is described below
commit 3ae96c3b8342f37311224acf6c53cf0087d70033
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 15 13:42:56 2022 +0200
ISIS-3198: move rendering hinting into their own package
---
.../common/ui/custom/WhereInTheWorldPanel.java | 9 ++-
.../viewers/common/wkt/InteractionTestWkt.java | 4 +-
.../commons/model/src/main/java/module-info.java | 1 +
.../commons/model/hints/HasRenderingHints.java | 42 ++++++++++
.../viewer/commons/model/hints/RenderingHint.java | 71 +++++++++++++++++
.../isis/viewer/commons/model/object/UiObject.java | 90 ----------------------
.../wicket/model/models/ChainingObjectModel.java | 2 +-
.../wicket/model/models/EntityCollectionModel.java | 7 +-
.../wicket/model/models/ObjectAdapterModel.java | 4 +-
.../viewer/wicket/model/models/ScalarModel.java | 11 ++-
.../wicket/model/models/ScalarPropertyModel.java | 7 +-
.../viewer/wicket/model/models/UiObjectWkt.java | 1 +
.../ajaxtable/columns/GenericTitleColumn.java | 2 +-
.../components/entity/fieldset/PropertyGroup.java | 3 +-
.../ui/components/property/PropertyEditPanel.java | 4 +-
.../widgets/zclip/ZeroClipboardPanel.java | 6 +-
16 files changed, 146 insertions(+), 118 deletions(-)
diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
index 1202d06896..ae2acb4b8b 100644
--- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
+++ b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
@@ -26,16 +26,17 @@ import org.apache.wicket.request.resource.ByteArrayResource;
import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.commons.model.object.UiObject;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import demoapp.dom.featured.customui.geocoding.GeoapifyClient;
-import demoapp.dom.featured.customui.vm.WhereInTheWorldVm;
import lombok.SneakyThrows;
import lombok.val;
+import demoapp.dom.featured.customui.geocoding.GeoapifyClient;
+import demoapp.dom.featured.customui.vm.WhereInTheWorldVm;
+
//tag::class[]
public class WhereInTheWorldPanel
extends PanelAbstract<ManagedObject, UiObjectWkt> {
@@ -103,7 +104,7 @@ extends PanelAbstract<ManagedObject, UiObjectWkt> {
val scalarModel =
getModel().getPropertyModel( // <.>
property, ScalarRepresentation.VIEWING,
- UiObject.RenderingHint.REGULAR);
+ RenderingHint.REGULAR);
return getComponentFactoryRegistry().createComponent( // <.>
propertyId, UiComponentType.SCALAR_NAME_AND_VALUE, scalarModel);
}
diff --git a/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java b/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java
index 04eca1588b..b74960acd9 100644
--- a/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java
+++ b/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java
@@ -47,9 +47,9 @@ import org.apache.isis.testdomain.model.interaction.Configuration_usingInteracti
import org.apache.isis.testdomain.model.interaction.InteractionDemo;
import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import org.apache.isis.viewer.commons.model.decorators.DisablingDecorator.DisablingDecorationModel;
-import org.apache.isis.viewer.commons.model.object.UiObject.RenderingHint;
-import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
diff --git a/viewers/commons/model/src/main/java/module-info.java b/viewers/commons/model/src/main/java/module-info.java
index 70a009c00a..6eeddc7830 100644
--- a/viewers/commons/model/src/main/java/module-info.java
+++ b/viewers/commons/model/src/main/java/module-info.java
@@ -28,6 +28,7 @@ module org.apache.isis.viewer.commons.model {
exports org.apache.isis.viewer.commons.model.action;
exports org.apache.isis.viewer.commons.model.decorators;
exports org.apache.isis.viewer.commons.model.scalar;
+ exports org.apache.isis.viewer.commons.model.hints;
requires lombok;
requires transitive org.apache.isis.applib;
diff --git a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/hints/HasRenderingHints.java b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/hints/HasRenderingHints.java
new file mode 100644
index 0000000000..ced2b1eab2
--- /dev/null
+++ b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/hints/HasRenderingHints.java
@@ -0,0 +1,42 @@
+package org.apache.isis.viewer.commons.model.hints;
+
+import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
+
+public interface HasRenderingHints {
+
+ /**
+ * @apiNote Similar to {@code #mustBeEditable()}, though not called from the same locations.
+ * My suspicion is that it amounts to more or less the same set of conditions.
+ */
+ boolean isInlinePrompt();
+
+ RenderingHint getRenderingHint();
+ @Deprecated// make immutable? - need to recreate any bound UI components anyway
+ void setRenderingHint(RenderingHint renderingHint);
+
+ ScalarRepresentation getMode();
+ @Deprecated// make immutable? - need to recreate any bound UI components anyway
+ void setMode(ScalarRepresentation mode);
+
+ // -- SHORTCUTS
+
+ default boolean isViewMode() {
+ return getMode() == ScalarRepresentation.VIEWING;
+ }
+
+ default boolean isEditMode() {
+ return getMode() == ScalarRepresentation.EDITING;
+ }
+
+ default HasRenderingHints toEditMode() {
+ setMode(ScalarRepresentation.EDITING);
+ return this;
+ }
+
+ default HasRenderingHints toViewMode() {
+ setMode(ScalarRepresentation.VIEWING);
+ return this;
+ }
+
+}
\ No newline at end of file
diff --git a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/hints/RenderingHint.java b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/hints/RenderingHint.java
new file mode 100644
index 0000000000..a99f0a30cd
--- /dev/null
+++ b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/hints/RenderingHint.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.viewer.commons.model.hints;
+
+import org.apache.isis.applib.annotation.Where;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum RenderingHint {
+ // normal form
+ REGULAR(Where.OBJECT_FORMS),
+
+ // inside parent table
+ PARENTED_PROPERTY_COLUMN(Where.PARENTED_TABLES),
+ PARENTED_TITLE_COLUMN(Where.PARENTED_TABLES),
+
+ // stand alone table
+ STANDALONE_PROPERTY_COLUMN(Where.STANDALONE_TABLES),
+ STANDALONE_TITLE_COLUMN(Where.STANDALONE_TABLES);
+
+ private final Where where;
+ public Where asWhere() {
+ return this.where;
+ }
+
+ public boolean isRegular() {
+ return this == REGULAR;
+ }
+
+ public boolean isInParentedTable() {
+ return this == PARENTED_PROPERTY_COLUMN;
+ }
+
+ public boolean isInStandaloneTable() {
+ return this == STANDALONE_PROPERTY_COLUMN;
+ }
+
+ public boolean isInTable() {
+ return isInParentedTable() || isInStandaloneTable() || isInTableTitleColumn();
+ }
+
+ public boolean isInTableTitleColumn() {
+ return isInParentedTableTitleColumn() || isInStandaloneTableTitleColumn();
+ }
+
+ public boolean isInParentedTableTitleColumn() {
+ return this == PARENTED_TITLE_COLUMN;
+ }
+
+ public boolean isInStandaloneTableTitleColumn() {
+ return this == STANDALONE_TITLE_COLUMN;
+ }
+
+}
\ No newline at end of file
diff --git a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/UiObject.java b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/UiObject.java
index dc7bb1021f..f03a41c229 100644
--- a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/UiObject.java
+++ b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/UiObject.java
@@ -18,15 +18,11 @@
*/
package org.apache.isis.viewer.commons.model.object;
-import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.object.MmVisibilityUtil;
import org.apache.isis.viewer.commons.model.UiModel;
-import lombok.RequiredArgsConstructor;
-
public interface UiObject extends UiModel {
ManagedObject getManagedObject();
@@ -36,90 +32,4 @@ public interface UiObject extends UiModel {
.isVisible(getManagedObject(), InteractionInitiatedBy.USER);
}
- @RequiredArgsConstructor
- public enum RenderingHint {
- // normal form
- REGULAR(Where.OBJECT_FORMS),
-
- // inside parent table
- PARENTED_PROPERTY_COLUMN(Where.PARENTED_TABLES),
- PARENTED_TITLE_COLUMN(Where.PARENTED_TABLES),
-
- // stand alone table
- STANDALONE_PROPERTY_COLUMN(Where.STANDALONE_TABLES),
- STANDALONE_TITLE_COLUMN(Where.STANDALONE_TABLES);
-
- private final Where where;
- public Where asWhere() {
- return this.where;
- }
-
- public boolean isRegular() {
- return this == REGULAR;
- }
-
- public boolean isInParentedTable() {
- return this == PARENTED_PROPERTY_COLUMN;
- }
-
- public boolean isInStandaloneTable() {
- return this == STANDALONE_PROPERTY_COLUMN;
- }
-
- public boolean isInTable() {
- return isInParentedTable() || isInStandaloneTable() || isInTableTitleColumn();
- }
-
- public boolean isInTableTitleColumn() {
- return isInParentedTableTitleColumn() || isInStandaloneTableTitleColumn();
- }
-
- public boolean isInParentedTableTitleColumn() {
- return this == PARENTED_TITLE_COLUMN;
- }
-
- public boolean isInStandaloneTableTitleColumn() {
- return this == STANDALONE_TITLE_COLUMN;
- }
-
- }
-
- public interface HasRenderingHints {
-
- /**
- * @apiNote Similar to {@code #mustBeEditable()}, though not called from the same locations.
- * My suspicion is that it amounts to more or less the same set of conditions.
- */
- boolean isInlinePrompt();
-
- RenderingHint getRenderingHint();
- @Deprecated// make immutable? - need to recreate any bound UI components anyway
- void setRenderingHint(RenderingHint renderingHint);
-
- ScalarRepresentation getMode();
- @Deprecated// make immutable? - need to recreate any bound UI components anyway
- void setMode(ScalarRepresentation mode);
-
- // -- SHORTCUTS
-
- default boolean isViewMode() {
- return getMode() == ScalarRepresentation.VIEWING;
- }
-
- default boolean isEditMode() {
- return getMode() == ScalarRepresentation.EDITING;
- }
-
- default HasRenderingHints toEditMode() {
- setMode(ScalarRepresentation.EDITING);
- return this;
- }
-
- default HasRenderingHints toViewMode() {
- setMode(ScalarRepresentation.VIEWING);
- return this;
- }
-
- }
-
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ChainingObjectModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ChainingObjectModel.java
index 7183e392f7..90c22b7fd5 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ChainingObjectModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ChainingObjectModel.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.commons.model.object.UiObject.RenderingHint;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
/**
* Wraps a {@link ScalarModel} to act as an {@link ObjectAdapterModel}.
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 7e16f7c8ba..8a96a42e85 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -28,6 +28,7 @@ import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataTableMo
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import lombok.Getter;
@@ -49,15 +50,15 @@ extends
* <p>
* This deals with both persisted and transient objects.
*/
- STANDALONE(UiObjectWkt.RenderingHint.STANDALONE_PROPERTY_COLUMN, 25),
+ STANDALONE(RenderingHint.STANDALONE_PROPERTY_COLUMN, 25),
/**
* A collection of an entity (eg Order/OrderDetail).
*/
- PARENTED(UiObjectWkt.RenderingHint.PARENTED_PROPERTY_COLUMN, 12),
+ PARENTED(RenderingHint.PARENTED_PROPERTY_COLUMN, 12),
;
- @Getter private final UiObjectWkt.RenderingHint columnRenderingHint;
+ @Getter private final RenderingHint columnRenderingHint;
@Getter private final int pageSizeDefault;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
index a8003948ba..8e1d3ea578 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
@@ -23,8 +23,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.commons.model.object.UiObject.HasRenderingHints;
-import org.apache.isis.viewer.commons.model.object.UiObject.RenderingHint;
+import org.apache.isis.viewer.commons.model.hints.HasRenderingHints;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
public interface ObjectAdapterModel
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 91062f24f8..4b0cb75f76 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -39,9 +39,8 @@ import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.object.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.util.Facets;
-import org.apache.isis.viewer.commons.model.object.UiObject;
-import org.apache.isis.viewer.commons.model.object.UiObject.HasRenderingHints;
-import org.apache.isis.viewer.commons.model.object.UiObject.RenderingHint;
+import org.apache.isis.viewer.commons.model.hints.HasRenderingHints;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.commons.model.scalar.UiScalar;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
@@ -52,8 +51,8 @@ import lombok.Setter;
import lombok.val;
/**
- * Represents a scalar of an entity, either a {@link EitherParamOrProp#PROPERTY property} or
- * a {@link EitherParamOrProp#PARAMETER parameter}.
+ * Represents a scalar of an entity, either a PROPERTY or
+ * a PARAMETER.
*
* <p>
* Is the backing model to each of the fields that appear in forms (for entities
@@ -100,7 +99,7 @@ implements HasRenderingHints, UiScalar, LinksProvider, FormExecutorContext {
protected ScalarModel(
final @NonNull UiObjectWkt parentEntityModel,
final @NonNull ScalarRepresentation viewOrEdit,
- final @NonNull UiObject.RenderingHint renderingHint) {
+ final @NonNull RenderingHint renderingHint) {
super(parentEntityModel); // the so called target model, we are chaining us to
this.parentEntityModel = parentEntityModel;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
index 9cacb238e2..d85a70a4b5 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.interactions.managed.ManagedValue;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.commons.model.scalar.HasUiProperty;
import org.apache.isis.viewer.wicket.model.models.interaction.prop.UiPropertyWkt;
@@ -43,7 +44,7 @@ implements HasUiProperty {
public static ScalarPropertyModel wrap(
final UiPropertyWkt uiProperty,
final ScalarRepresentation viewOrEdit,
- final UiObjectWkt.RenderingHint renderingHint) {
+ final RenderingHint renderingHint) {
return new ScalarPropertyModel(uiProperty, viewOrEdit, renderingHint);
}
@@ -55,7 +56,7 @@ implements HasUiProperty {
private ScalarPropertyModel(
final UiPropertyWkt uiProperty,
final ScalarRepresentation viewOrEdit,
- final UiObjectWkt.RenderingHint renderingHint) {
+ final RenderingHint renderingHint) {
super(UiObjectWkt.ofAdapter(uiProperty.getMetaModelContext(), uiProperty.getOwner()),
viewOrEdit, renderingHint);
this.uiProperty = uiProperty;
@@ -64,7 +65,7 @@ implements HasUiProperty {
/** @return new instance bound to the same delegate */
public ScalarPropertyModel copyHaving(
final ScalarRepresentation viewOrEdit,
- final UiObjectWkt.RenderingHint renderingHint) {
+ final RenderingHint renderingHint) {
return wrap(uiProperty, viewOrEdit, renderingHint);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/UiObjectWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/UiObjectWkt.java
index b826996951..7ba1333452 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/UiObjectWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/UiObjectWkt.java
@@ -35,6 +35,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.spec.feature.memento.PropertyMemento;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.commons.model.object.UiObject;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
index c616652433..d6b4b18b01 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.isis.core.metamodel.object.ManagedObjects;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.commons.model.object.UiObject.RenderingHint;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel.Variant;
import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index 4a59f2ab0c..e10f18d107 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -38,6 +38,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
@@ -186,7 +187,7 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, UiObjectWkt> imp
final Consumer<LinkAndLabel> onAssociatedAction) {
final ScalarModel scalarModel =
- entityModel.getPropertyModel(property, ScalarRepresentation.VIEWING, UiObjectWkt.RenderingHint.REGULAR);
+ entityModel.getPropertyModel(property, ScalarRepresentation.VIEWING, RenderingHint.REGULAR);
final Component scalarNameAndValueComponent = getComponentFactoryRegistry()
.addOrReplaceComponent(container, ID_PROPERTY, UiComponentType.SCALAR_NAME_AND_VALUE, scalarModel);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
index 64b152f54e..2da4b5530f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -23,9 +23,9 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
-import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.actions.ActionParametersPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -52,7 +52,7 @@ extends PanelAbstract<ManagedObject, ScalarPropertyModel> {
super(id, scalarModel.copyHaving(
ScalarRepresentation.EDITING,
- UiObjectWkt.RenderingHint.REGULAR));
+ RenderingHint.REGULAR));
buildGui(scalarModel);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index a6f0218dcf..dc75c59790 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -26,8 +26,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.object.ManagedObject;
+import org.apache.isis.viewer.commons.model.hints.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.ObjectAdapterModel;
-import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -60,9 +60,9 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
ObjectAdapterModel model = getModel();
addSimpleClipboardModalWindow();
- UiObjectWkt.RenderingHint renderingHint = model.getRenderingHint();
+ RenderingHint renderingHint = model.getRenderingHint();
ScalarRepresentation mode = model.getMode();
- setVisible(renderingHint == UiObjectWkt.RenderingHint.REGULAR && mode == ScalarRepresentation.VIEWING);
+ setVisible(renderingHint == RenderingHint.REGULAR && mode == ScalarRepresentation.VIEWING);
// disable, since currently not honoured if used as a URL (think that session hints are taking precedence).
// (see ISIS-1660 to resurrect)