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 2020/08/13 10:36:23 UTC
[isis] 02/03: ISIS-2340: remove ObjectBinding
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 4091b7b6725c06130f21961ad3812ca0d758bd64
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 13 12:34:06 2020 +0200
ISIS-2340: remove ObjectBinding
---
.../isis/core/metamodel/spec/ManagedObjects.java | 2 +-
.../javafx/ui/components/object/ObjectViewFx.java | 19 +++--
.../vaadin/ui/components/object/ObjectViewVaa.java | 12 ++--
.../common/model/binding/UiComponentFactory.java | 1 -
.../model/binding/interaction/ObjectBinding.java | 81 ----------------------
5 files changed, 16 insertions(+), 99 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index 1707af7..46e844c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -275,7 +275,7 @@ public final class ManagedObjects {
return abbreviated(titleOf(adapter), maxLength, suffix);
}
- private static String titleOf(ManagedObject adapter) {
+ public static String titleOf(ManagedObject adapter) {
return adapter!=null?adapter.titleString(null):"";
}
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 8eed92d..12f0200 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
@@ -37,6 +37,7 @@ import org.apache.isis.core.metamodel.interactions.managed.CollectionInteraction
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.incubator.viewer.javafx.model.context.UiContext;
import org.apache.isis.incubator.viewer.javafx.model.util._fx;
import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentFactoryFx;
@@ -44,17 +45,15 @@ import org.apache.isis.incubator.viewer.javafx.ui.components.collections.TableVi
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.binding.interaction.ObjectBinding;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingUiModel;
import org.apache.isis.viewer.common.model.gridlayout.UiGridLayout;
-import lombok.NonNull;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import javafx.scene.control.TabPane;
import javafx.scene.layout.Pane;
import javafx.scene.layout.VBox;
+import lombok.NonNull;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class ObjectViewFx extends VBox {
@@ -80,7 +79,7 @@ public class ObjectViewFx extends VBox {
log.info("binding object interaction to owner {}", managedObject.getSpecification().getIdentifier());
_Assert.assertTrue(uiContext.getIsisInteractionFactory().isInInteraction(), "requires an active interaction");
- val objectInteractor = ObjectBinding.bind(managedObject);
+ val objectTitle = ManagedObjects.titleOf(managedObject);
val uiGridLayout = UiGridLayout.bind(managedObject);
@@ -88,7 +87,7 @@ public class ObjectViewFx extends VBox {
@Override
protected void onObjectTitle(Pane container, DomainObjectLayoutData domainObjectData) {
- val label = _fx.h2(_fx.newLabel(container, objectInteractor.getTitle()));
+ val label = _fx.h2(_fx.newLabel(container, objectTitle));
label.maxWidthProperty().bind(
container.widthProperty());
}
@@ -163,7 +162,7 @@ public class ObjectViewFx extends VBox {
@Override
protected void onAction(Pane container, ActionLayoutData actionData) {
- val owner = objectInteractor.getManagedObject();
+ val owner = managedObject;
val interaction = ActionInteraction.start(owner, actionData.getId(), Where.OBJECT_FORMS);
interaction.checkVisibility()
.getManagedAction()
@@ -190,7 +189,7 @@ public class ObjectViewFx extends VBox {
@Override
protected void onProperty(Pane container, PropertyLayoutData propertyData) {
- val owner = objectInteractor.getManagedObject();
+ val owner = managedObject;
val formPane = (FormPane) container;
@@ -224,7 +223,7 @@ public class ObjectViewFx extends VBox {
@Override
protected void onCollection(Pane container, CollectionLayoutData collectionData) {
- val owner = objectInteractor.getManagedObject();
+ val owner = managedObject;
CollectionInteraction.start(owner, collectionData.getId(), Where.OBJECT_FORMS)
.checkVisibility()
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 9fc0c0d..87a496e 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
@@ -47,11 +47,11 @@ import org.apache.isis.core.metamodel.interactions.managed.CollectionInteraction
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+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.binding.interaction.ObjectBinding;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingUiModel;
import org.apache.isis.viewer.common.model.gridlayout.UiGridLayout;
@@ -79,7 +79,7 @@ public class ObjectViewVaa extends VerticalLayout {
final ManagedObject managedObject) {
- val objectInteractor = ObjectBinding.bind(managedObject);
+ val objectTitle = ManagedObjects.titleOf(managedObject);
val uiGridLayout = UiGridLayout.bind(managedObject);
@@ -90,7 +90,7 @@ public class ObjectViewVaa extends VerticalLayout {
@Override
protected void onObjectTitle(HasComponents container, DomainObjectLayoutData domainObjectData) {
- val uiTitle = _vaa.add(container, new H1(objectInteractor.getTitle()));
+ val uiTitle = _vaa.add(container, new H1(objectTitle));
// uiTitle.addThemeVariants(
// ButtonVariant.LUMO_LARGE,
// ButtonVariant.LUMO_TERTIARY_INLINE);
@@ -179,7 +179,7 @@ public class ObjectViewVaa extends VerticalLayout {
@Override
protected void onAction(HasComponents container, ActionLayoutData actionData) {
- val owner = objectInteractor.getManagedObject();
+ val owner = managedObject;
val interaction = ActionInteraction.start(owner, actionData.getId(), Where.OBJECT_FORMS);
interaction.checkVisibility()
.getManagedAction()
@@ -201,7 +201,7 @@ public class ObjectViewVaa extends VerticalLayout {
@Override
protected void onProperty(HasComponents container, PropertyLayoutData propertyData) {
- val owner = objectInteractor.getManagedObject();
+ val owner = managedObject;
val interaction = PropertyInteraction.start(owner, propertyData.getId(), Where.OBJECT_FORMS);
interaction.checkVisibility()
@@ -228,7 +228,7 @@ public class ObjectViewVaa extends VerticalLayout {
@Override
protected void onCollection(HasComponents container, CollectionLayoutData collectionData) {
- val owner = objectInteractor.getManagedObject();
+ val owner = managedObject;
CollectionInteraction.start(owner, collectionData.getId(), Where.OBJECT_FORMS)
.checkVisibility()
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/binding/UiComponentFactory.java
index 59e74d2..93c8425 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/binding/UiComponentFactory.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.commons.handler.ChainOfResponsibility;
import org.apache.isis.core.commons.internal.functions._Predicates;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.value.blobs.BlobValueFacet;
import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.ManagedFeature;
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/interaction/ObjectBinding.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/interaction/ObjectBinding.java
deleted file mode 100644
index 20931d2..0000000
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/interaction/ObjectBinding.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.common.model.binding.interaction;
-
-import org.apache.isis.core.metamodel.spec.ManagedObject;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor(staticName = "bind")
-public class ObjectBinding {
-
- @Getter
- private final ManagedObject managedObject;
-
- public String getTitle() {
- return managedObject.getSpecification().getTitle(null, managedObject);
- }
-
-// @Deprecated
-// public Stream<OneToOneAssociation> streamVisisbleProperties() {
-// return managedObject.getSpecification()
-// .streamAssociations(Contributed.INCLUDED)
-// .filter(objMember->objMember.getFeatureType().isProperty())
-// //TODO filter visibility
-// .map(OneToOneAssociation.class::cast);
-// }
-//
-// @Deprecated
-// public Stream<OneToManyAssociation> streamVisisbleCollections() {
-// return managedObject.getSpecification()
-// .streamAssociations(Contributed.INCLUDED)
-// .filter(objMember->objMember.getFeatureType().isCollection())
-// //TODO filter visibility
-// .map(OneToManyAssociation.class::cast);
-// }
-//
-// @Deprecated
-// public Stream<ObjectAction> streamVisisbleActions() {
-// return managedObject.getSpecification()
-// .streamObjectActions(Contributed.INCLUDED)
-// .filter(objMember->objMember.getFeatureType().isAction())
-// //TODO filter visibility
-// .map(ObjectAction.class::cast);
-// }
-//
-// public Optional<ObjectAction> lookupAction(String actionId) {
-// return streamVisisbleActions()
-// .filter(action->Objects.equals(actionId, action.getId()))
-// .findFirst();
-// }
-//
-// public Optional<OneToOneAssociation> lookupVisibleProperty(String propertyId) {
-// return streamVisisbleProperties()
-// .filter(property->Objects.equals(propertyId, property.getId()))
-// .findFirst();
-// }
-//
-// public Optional<OneToManyAssociation> lookupCollection(String collectionId) {
-// return streamVisisbleCollections()
-// .filter(collection->Objects.equals(collectionId, collection.getId()))
-// .findFirst();
-// }
-
-}