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 2019/03/01 15:17:38 UTC

[isis] 01/01: ISIS-2033: merge 'v2' into 'IoC'

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

ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 439339818e8ab892cf07ca31a95f8d9b2d335935
Merge: 8403d82 a494f56
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 1 16:17:31 2019 +0100

    ISIS-2033: merge 'v2' into 'IoC'
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

 .gitlab-ci.yml                                          |  2 +-
 .../ui/components/tree/IsisToWicketTreeAdapter.java     | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index 4f17dae,98c4061..1f41de1
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@@ -43,18 -56,6 +43,19 @@@ import org.apache.isis.viewer.wicket.mo
  import org.apache.isis.viewer.wicket.model.models.ScalarModel;
  import org.apache.isis.viewer.wicket.model.models.ValueModel;
  import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
 +import org.apache.wicket.Component;
 +import org.apache.wicket.MarkupContainer;
 +import org.apache.wicket.ajax.AjaxRequestTarget;
 +import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
 +import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
 +import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
 +import org.apache.wicket.extensions.markup.html.repeater.tree.Node;
++import org.apache.wicket.markup.html.basic.Label;
 +import org.apache.wicket.model.IModel;
 +import org.apache.wicket.model.LoadableDetachableModel;
 +import org.apache.wicket.model.Model;
 +
 +import lombok.val;
  
  class IsisToWicketTreeAdapter {