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 2022/03/03 10:59:56 UTC
[isis] branch master updated: ISIS-2877: regression: fixes missing tree theme
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
The following commit(s) were added to refs/heads/master by this push:
new 9e6232f ISIS-2877: regression: fixes missing tree theme
9e6232f is described below
commit 9e6232fe832efbe5cd6d8fd3e4c2b4d963fb4629
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 3 11:59:48 2022 +0100
ISIS-2877: regression: fixes missing tree theme
---
.../ui/components/tree/ParentedTreePanel.html | 5 +-
.../ui/components/tree/ParentedTreePanel.java | 15 +++---
.../wicket/ui/components/tree/TreePanel.html | 62 ----------------------
3 files changed, 11 insertions(+), 71 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.html
index 039a718..f3d90ec 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.html
@@ -27,8 +27,9 @@
<div class="scalarNameAndValueComponentType"
wicket:id="scalarTypeContainer">
- <wicket:container wicket:id="scalarIfRegular"></wicket:container>
- <wicket:container wicket:id="scalarIfCompact"></wicket:container>
+ <wicket:container wicket:id="scalarIfRegular" />
+ <wicket:container wicket:id="scalarIfCompact" />
+
</div>
</wicket:panel>
</body>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java
index 33d2838..715d8a0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java
@@ -40,12 +40,12 @@ extends ScalarPanelAbstract {
@Override
protected MarkupContainer createComponentForRegular() {
- return createTreeComponent(ID_SCALAR_IF_REGULAR);
+ return createTreeComponent(getScalarTypeContainer(), ID_SCALAR_IF_REGULAR);
}
@Override
protected MarkupContainer createComponentForCompact() {
- return createTreeComponent(ID_SCALAR_IF_COMPACT);
+ return createTreeComponent(getScalarTypeContainer(), ID_SCALAR_IF_COMPACT);
}
@Override
@@ -60,12 +60,13 @@ extends ScalarPanelAbstract {
// -- HELPER
- private MarkupContainer createTreeComponent(final String id) {
+ private MarkupContainer createTreeComponent(final MarkupContainer parent, final String id) {
val scalarModel = scalarModel();
- val tree = (MarkupContainer) IsisToWicketTreeAdapter.adapt(id, scalarModel);
- // adds the tree-theme behavior to the tree component
- tree.add(getTreeThemeProvider().treeThemeFor(scalarModel));
- return tree;
+ val tree = IsisToWicketTreeAdapter.adapt(id, scalarModel);
+ parent.add(tree);
+ // adds the tree-theme behavior to the tree's parent
+ parent.add(getTreeThemeProvider().treeThemeFor(scalarModel));
+ return (MarkupContainer) tree;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
deleted file mode 100644
index 82512b3..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanel.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org" xml:lang="en" lang="en">
-<body>
-
- <!-- a stripped down copy of ScalarPanelTextFieldAbstract.html -->
-
- <wicket:panel>
- <div class="scalarNameAndValueComponentType"
- wicket:id="scalarTypeContainer">
-
- <div class="form-group" wicket:id="scalarIfRegular">
-
- <label class="scalarName col-form-label" wicket:id="scalarName">[Label text]</label>
- <span class="scalarValueWrapper">
- <div>
- <wicket:container wicket:id="scalarValueContainer">[regular-tree]</wicket:container>
- <span class="associatedActionLinksRight"
- wicket:id="associatedActionLinksRight">[drop down]</span>
- </div>
- <span wicket:id="feedback" class="form-text" />
- <span wicket:id="associatedActionLinksBelow" />
- </span>
- <div class="clearfix"></div>
- </div>
-
- <wicket:container wicket:id="scalarIfCompact">[compact-tree]</wicket:container>
-
- </div>
-
- <wicket:fragment wicket:id="textInlinePrompt">
- <span wicket:id="scalarValue" />
- </wicket:fragment>
-
- <wicket:fragment wicket:id="textarea">
- <textarea name="scalarValue"
- class="form-control form-control-sm scalarValue" wicket:id="scalarValue" />
- </wicket:fragment>
-
- </wicket:panel>
-</body>
-</html>
-