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 2021/09/01 07:44:51 UTC
[isis] branch master updated (671ab55 -> a379b3c)
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 671ab55 ISIS-2861: remove ViewModel.Cloneable
new 8f8dc98 ISIS-2861: remove comments
new a379b3c ISIS-2862: remove WizardFacet
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/isis/applib/ViewModel.java | 52 ----------------------
.../facets/object/wizard/WizardFacet.java | 41 -----------------
.../facets/object/wizard/WizardFacetAbstract.java | 36 ---------------
.../core/metamodel/spec/ObjectSpecification.java | 2 -
.../core/metamodel/spec/feature/ObjectAction.java | 20 +--------
.../specimpl/dflt/ObjectSpecificationDefault.java | 6 ---
.../testspec/ObjectSpecificationStub.java | 5 ---
7 files changed, 1 insertion(+), 161 deletions(-)
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacet.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacetAbstract.java
[isis] 02/02: ISIS-2862: remove WizardFacet
Posted by ah...@apache.org.
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 a379b3ce663fec57098c5959a3aa2a19b014317f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 1 09:44:45 2021 +0200
ISIS-2862: remove WizardFacet
---
.../facets/object/wizard/WizardFacet.java | 41 ----------------------
.../facets/object/wizard/WizardFacetAbstract.java | 36 -------------------
.../core/metamodel/spec/ObjectSpecification.java | 2 --
.../core/metamodel/spec/feature/ObjectAction.java | 20 +----------
.../specimpl/dflt/ObjectSpecificationDefault.java | 6 ----
.../testspec/ObjectSpecificationStub.java | 5 ---
6 files changed, 1 insertion(+), 109 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacet.java
deleted file mode 100644
index 0afac9e..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacet.java
+++ /dev/null
@@ -1,41 +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.core.metamodel.facets.object.wizard;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-
-/**
- * Indicates that this class is a wizard.
- */
-public interface WizardFacet extends Facet {
-
-
- public void next(Object pojo);
- public String disableNext(Object pojo);
-
- public void previous(Object pojo);
- public String disablePrevious(Object pojo);
-
- public Object finish(Object pojo);
- public String disableFinish(Object pojo);
-
- boolean isWizardAction(ObjectAction input);
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacetAbstract.java
deleted file mode 100644
index 864077d..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/wizard/WizardFacetAbstract.java
+++ /dev/null
@@ -1,36 +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.core.metamodel.facets.object.wizard;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-public abstract class WizardFacetAbstract extends FacetAbstract implements WizardFacet {
-
- private static final Class<? extends Facet> type() {
- return WizardFacet.class;
- }
-
- public WizardFacetAbstract(final FacetHolder holder) {
- super(type(), holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 6aa4142..a3cc57e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -420,8 +420,6 @@ extends
return getBeanSort().isMixin();
}
- boolean isWizard();
-
//TODO this predicate can now be answered by getBeanSort().isAbstract(), we can retire any old logic
boolean isAbstract();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 178dd33..0d11f1e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -47,7 +47,6 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFactory;
import org.apache.isis.core.metamodel.facets.members.layout.group.LayoutGroupFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
-import org.apache.isis.core.metamodel.facets.object.wizard.WizardFacet;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
import org.apache.isis.core.metamodel.interactions.managed.ActionInteractionHead;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -349,8 +348,7 @@ public interface ObjectAction extends ObjectMember {
.isSharingAnyLayoutGroupOf(spec.streamAssociations(MixedIn.INCLUDED))
.negate())
.filter(Predicates
- .dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE))
- .filter(Predicates.isNotWizard(spec));
+ .dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE));
}
public static Stream<ObjectAction> findForAssociation(
@@ -361,7 +359,6 @@ public interface ObjectAction extends ObjectMember {
return spec.streamRuntimeActions(MixedIn.INCLUDED)
.filter(Predicates.isSameLayoutGroupAs(association))
- .filter(Predicates.isNotWizard(spec))
.sorted(Comparators.byMemberOrderSequence(false));
}
@@ -510,21 +507,6 @@ public interface ObjectAction extends ObjectMember {
};
}
- private static Predicate<ObjectAction> isNotWizard(final ObjectSpecification objectSpecification) {
- return isWizard(objectSpecification).negate();
- }
-
- private static Predicate<ObjectAction> isWizard(final ObjectSpecification objectSpecification) {
- return (final ObjectAction input) -> {
- if (objectSpecification == null) {
- return false;
- }
- val wizardFacet = objectSpecification.getFacet(WizardFacet.class);
- return wizardFacet != null && wizardFacet.isWizardAction(input);
- };
- }
-
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index b340177..169d320 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -47,7 +47,6 @@ import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacetForStaticMemberName;
import org.apache.isis.core.metamodel.facets.object.introspection.IntrospectionPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.facets.object.wizard.WizardFacet;
import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
@@ -252,11 +251,6 @@ implements FacetHolder {
// -- PREDICATES
@Override
- public boolean isWizard() {
- return containsFacet(WizardFacet.class);
- }
-
- @Override
public String getManagedBeanName() {
return nameIfIsManagedBean;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 1035be5..f591743 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -319,11 +319,6 @@ implements ObjectSpecification {
// /////////////////////////////////////////////////////////
@Override
- public boolean isWizard() {
- return false;
- }
-
- @Override
public String toString() {
return getFullIdentifier();
}
[isis] 01/02: ISIS-2861: remove comments
Posted by ah...@apache.org.
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 8f8dc98be1fd01c61c4ad43d567eb57669f8f193
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 1 09:42:33 2021 +0200
ISIS-2861: remove comments
---
.../java/org/apache/isis/applib/ViewModel.java | 52 ----------------------
1 file changed, 52 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
index e80d66f..ca19cf3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/ViewModel.java
@@ -52,56 +52,4 @@ public interface ViewModel {
@Programmatic
void viewModelInit(String memento);
-// /**
-// * Cloneable view models can in effect appear to be editable; the viewer can build a new view model from a
-// * view model whose state has been edited.
-// */
-// public interface Cloneable {
-// /**
-// *
-// * @return a copy of this object - injection points are automatically resolved by the framework
-// */
-// @Programmatic
-// Object copy();
-// }
-//
-// /**
-// * Specialization of {@link ViewModel.Cloneable},
-// * that utilizes Java serialization to in-memory create ViewModel clones.
-// * @since 2.0
-// */
-// public interface CloneableViaSerialization
-// extends
-// Cloneable,
-// Serializable {
-// @Override
-// @Programmatic
-// default Object copy() {
-// val bytes = _Serializables.write(this);
-// val copy = _Serializables.read(this.getClass(), bytes);
-// return copy;
-// }
-// }
-//
-// /**
-// * Specialization of {@link ViewModel.Cloneable},
-// * that utilizes {@link ViewModel}'s mementos to in-memory create ViewModel clones.
-// * @since 2.0
-// */
-// public interface CloneableViaMemento
-// extends
-// Cloneable,
-// ViewModel {
-// @Override
-// @Programmatic
-// @SneakyThrows
-// default Object copy() {
-// val memento = this.viewModelMemento();
-// val copy = this.getClass().getDeclaredConstructor().newInstance();
-// copy.viewModelInit(memento);
-// return copy;
-// }
-// }
-
-
}