[isis] branch v2 updated (6a6c125 -> b88325b)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 6a6c125  Merge branch 'master' into v2
     add c7422c7  ISIS-1280: refactors redirection to use a BookmarkablePageLink
     add 59b21eb  ISIS-1280: further tweaks on link
     new b88325b  Merge branch 'master' into v2

The 1 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:
 .../entity/icontitle/EntityIconAndTitlePanel.java  | 53 ++++++++--------------
 1 file changed, 20 insertions(+), 33 deletions(-)

[isis] 01/01: Merge branch 'master' into v2

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit b88325b5831026d78c07f8bd38088e99355d8e06
Merge: 6a6c125 59b21eb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 12 10:55:00 2019 +0000

    Merge branch 'master' into v2

 .../entity/icontitle/EntityIconAndTitlePanel.java  | 53 ++++++++--------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 0d33439,fd67aa3..bf54749
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@@ -19,12 -19,8 +19,7 @@@
  
  package org.apache.isis.viewer.wicket.ui.components.entity.icontitle;
  
 -import org.apache.wicket.AttributeModifier;
  import org.apache.wicket.Page;
- import java.util.concurrent.Callable;
- 
- import org.apache.wicket.AttributeModifier;
- import org.apache.wicket.ajax.AjaxRequestTarget;
- import org.apache.wicket.ajax.markup.html.AjaxLink;
  import org.apache.wicket.markup.html.WebMarkupContainer;
  import org.apache.wicket.markup.html.basic.Label;
  import org.apache.wicket.markup.html.image.Image;
@@@ -33,10 -30,9 +29,9 @@@ import org.apache.wicket.request.mapper
  import org.apache.wicket.request.resource.ResourceReference;
  
  import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 -import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 +import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
  import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
  import org.apache.isis.core.metamodel.facets.object.projection.ProjectionFacet;
- import org.apache.isis.core.metamodel.spec.ObjectSpecification;
  import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
  import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
  import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;