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 2018/11/17 14:33:23 UTC
[isis] branch v2 updated: ISIS-1991: removing debug code
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new eb6d4fb ISIS-1991: removing debug code
eb6d4fb is described below
commit eb6d4fb62629345ecfb1050aab179e6b516572f3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Nov 17 15:33:18 2018 +0100
ISIS-1991: removing debug code
simple-app: updating mml approved
Task-Url: https://issues.apache.org/jira/browse/ISIS-1991
---
.../metamodel/interactions/InteractionUtils.java | 8 +-------
...p.application.fixture.scenarios.DomainAppDemo.xml | 6 +++---
...plication.services.homepage.HomePageViewModel.xml | 6 +++---
...omainapp.modules.simple.dom.impl.SimpleObject.xml | 8 ++++----
.../MetaModelService_IntegTest.exports.approved.xml | 20 ++++++++++----------
5 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
index 81135d5..e5a05a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
@@ -39,13 +39,7 @@ public final class InteractionUtils {
facets.forEach(facet->{
final HidingInteractionAdvisor advisor = (HidingInteractionAdvisor) facet;
- String hides = advisor.hides(context);
-
- if(hides!=null) {
- System.out.println("!!! advisor: " + advisor + " hides " + context.getIdentifier()+ " -> "+hides);
- }
-
- result.advise(hides, advisor);
+ result.advise(advisor.hides(context), advisor);
});
return result;
}
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.scenarios.DomainAppDemo.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.scenarios.DomainAppDemo.xml
index 6ff31fb..524b592 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.scenarios.DomainAppDemo.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.scenarios.DomainAppDemo.xml
@@ -67,7 +67,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -183,7 +183,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -244,7 +244,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
index 19d7634..f93cdda 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
@@ -149,7 +149,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -265,7 +265,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -326,7 +326,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
index ba0c936..8d4ff6a 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
@@ -496,7 +496,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -587,7 +587,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -703,7 +703,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -764,7 +764,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PROTOTYPING</mml:attr>
+ <mml:attr name="deploymentType">PROTOTYPING</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml
index 3195056..926d428 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml
@@ -333,7 +333,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -466,7 +466,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -538,7 +538,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -1178,7 +1178,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -1285,7 +1285,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -1418,7 +1418,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -1490,7 +1490,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -2117,7 +2117,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -2250,7 +2250,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
@@ -2322,7 +2322,7 @@
<mml:attr name="position">PANEL_DROPDOWN</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation">
- <mml:attr name="deploymentCategory">PRODUCTION</mml:attr>
+ <mml:attr name="deploymentType">PRODUCTION</mml:attr>
<mml:attr name="hiding">true</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">