You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/17 17:17:10 UTC
[isis] 01/02: Merge remote-tracking branch 'origin/master' into
dev/2.0.0/ISIS-1742-remove-deprecations
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2ec1b0f95b0e3929d6c3d7fd032580dcce8e024e
Merge: d609fd9 d54dc28
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 17 17:31:42 2017 +0100
Merge remote-tracking branch 'origin/master' into dev/2.0.0/ISIS-1742-remove-deprecations
CONTRIBUTING.md | 2 +-
README.adoc | 28 +-
adocs/documentation/preview-html.sh | 2 +-
.../src/main/asciidoc/documentation.adoc | 39 +-
.../asciidoc/guides/dg/_dg_hints-and-tips.adoc | 4 +
.../_dg_hints-and-tips_datanucleus-enhancer.adoc} | 4 +-
.../main/asciidoc/guides/dg/_dg_ide_eclipse.adoc | 2 +-
.../guides/dg/_dg_working-with-many-repos.adoc | 32 +-
.../src/main/asciidoc/guides/htg.adoc | 71 ++++
.../guides/rgant/_rgant-Action_command.adoc | 2 +-
.../guides/ugbtb/_ugbtb_hints-and-tips.adoc | 31 +-
.../ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc | 4 +-
...d-tips_how-to-handle-void-and-null-results.adoc | 4 +-
...s-and-tips_how-to-implement-a-spellchecker.adoc | 4 +-
.../ugbtb/_ugbtb_hints-and-tips_multi-tenancy.adoc | 4 +-
.../_ugbtb_hints-and-tips_persisted-title.adoc | 4 +-
.../_ugbtb_hints-and-tips_pushing-changes.adoc | 4 +-
..._replacing-default-service-implementations.adoc | 4 +-
...-and-tips_simulating-collections-of-values.adoc | 4 +-
...nts-and-tips_subclass-properties-in-tables.adoc | 4 +-
...btb_hints-and-tips_transactions-and-errors.adoc | 4 +-
.../_ugbtb_hints-and-tips_vetoing-visibility.adoc | 4 +-
...tb_hints-and-tips_view-model-instantiation.adoc | 5 +-
.../ugfun/_ugfun_building-blocks_modules.adoc | 2 +-
...ks_types-of-domain-objects_domain-services.adoc | 2 +-
...blocks_types-of-domain-objects_view-models.adoc | 6 +-
.../ugfun/_ugfun_core-concepts_philosophy_aop.adoc | 4 +-
.../ugfun/_ugfun_core-concepts_principles.adoc | 2 +-
.../guides/ugfun/_ugfun_getting-started.adoc | 40 --
...ugfun_getting-started_helloworld-archetype.adoc | 270 +++++++++++-
..._ugfun_getting-started_simpleapp-archetype.adoc | 471 ++++++++++++++++++---
.../asciidoc/guides/ugfun/_ugfun_ui-hints.adoc | 22 +-
.../_ugfun_ui-hints_action-icons-and-css.adoc | 4 +-
.../ugfun/_ugfun_ui-hints_eager-rendering.adoc | 4 +-
.../guides/ugfun/_ugfun_ui-hints_layout.adoc | 4 +-
.../_ugfun_ui-hints_names-and-descriptions.adoc | 4 +-
.../_ugfun_ui-hints_object-titles-and-icons.adoc | 4 +-
.../using-simple-app/structure/structure.pptx | Bin 0 -> 70518 bytes
.../structure/structure/Slide1.PNG | Bin 0 -> 43039 bytes
.../structure/structure/Slide2.PNG | Bin 0 -> 22610 bytes
.../src/main/asciidoc/guides/ugfun/ugfun.adoc | 5 +-
.../guides/ugodn/_ugodn_hints-and-tips.adoc | 17 +-
..._ugodn_hints-and-tips_diagnosing-n-plus-1.adoc} | 20 +-
.../guides/ugodn/_ugodn_hints-and-tips_java8.adoc | 4 +-
..._hints-and-tips_overriding-jdo-annotations.adoc | 4 +-
...nd-tips_subtype-entity-not-fully-populated.adoc | 4 +-
...-and-tips_typesafe-queries-and-fetchgroups.adoc | 112 +++++
.../images/hints-n-tips/diagnosing-n-plus-1.png | Bin 0 -> 143232 bytes
.../guides/ugsec/_ugsec_hints-and-tips.adoc | 14 +-
...ts-and-tips_configuring-isis-to-use-bypass.adoc | 4 +-
.../guides/ugsec/_ugsec_hints-and-tips_run-as.adoc | 4 +-
.../ugsec/_ugsec_hints-and-tips_shiro-caching.adoc | 4 +-
.../asciidoc/guides/ugtst/_ugtst_overview.adoc | 4 +-
.../guides/ugvro/_ugvro_hints-and-tips.adoc | 14 +-
.../ugvro/_ugvro_hints-and-tips_angular-tips.adoc | 4 +-
.../_ugvro_hints-and-tips_pretty-printing.adoc | 4 +-
...gvro_hints-and-tips_restful-image-property.adoc | 4 +-
...ugvro_hints-and-tips_using-chrome-devtools.adoc | 4 +-
.../asciidoc/guides/ugvw/_ugvw_hints-and-tips.adoc | 12 +-
...hints-and-tips_i18n-label-in-wicket-viewer.adoc | 4 +-
.../ugvw/_ugvw_hints-and-tips_per-user-themes.adoc | 6 +-
.../ugvw/_ugvw_hints-and-tips_svg-support.adoc | 4 +-
.../cheat-sheet/images/cheat-sheets/cover.png | Bin 151235 -> 141052 bytes
.../resources/cheat-sheets/IsisCheatSheet.docx | Bin 33225 -> 28593 bytes
.../resources/cheat-sheets/IsisCheatSheet.pdf | Bin 432718 -> 582035 bytes
.../core/metamodel/spec/feature/ObjectMember.java | 23 +-
.../wicket/ui/components/layout/bs3/col/Col.java | 8 +-
.../manifest/DomainAppAppManifestWithFixtures.java | 2 +-
68 files changed, 1092 insertions(+), 298 deletions(-)
diff --cc adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc
index 97df0db,f2d8ed0..48a6bda
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc
@@@ -1,12 -3,10 +3,10 @@@
[[_ugbtb_hints-and-tips_are-you-sure]]
= 'Are you sure?' idiom
:Notice: 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 a [...]
- :_basedir: ../../
- :_imagesdir: images/
-Sometimes an action might perform irreversible changes. In such a case it's probably a good idea for the UI to require that the
-end-user explicitly confirms that they intended to invoke the action.
+Sometimes an action might perform irreversible changes.
+In such a case it's probably a good idea for the UI to require that the end-user explicitly confirms that they intended to invoke the action.
== Using action semantics
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
index c3547ab,c7721e5..d9c9c1d
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
@@@ -34,8 -32,11 +34,8 @@@ import org.apache.isis.core.metamodel.c
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
- import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
+ import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderFacetComparator;
-import com.google.common.base.Function;
-import com.google.common.collect.Maps;
-
/**
* Provides reflective access to an action or a field on a domain object.
*/
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.