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 6343d064d5 ISIS-3123: use former markup samples (from demo) with value
semantics
6343d064d5 is described below
commit 6343d064d54b898cbd67aa355053c43d426627cf
Author: Andi Huber <[email protected]>
AuthorDate: Mon Oct 10 10:21:30 2022 +0200
ISIS-3123: use former markup samples (from demo) with value semantics
---
.../valuesemantics/MarkupValueSemantics.java | 13 ++++++++--
.../markups/samples/IsisMarkupSamples-sample1.html | 27 -------------------
.../markups/samples/IsisMarkupSamples-sample2.html | 27 -------------------
.../markups/samples/IsisMarkupSamples-sample3.html | 26 -------------------
.../markups/samples/IsisMarkupSamples-sample4.html | 30 ----------------------
5 files changed, 11 insertions(+), 112 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/MarkupValueSemantics.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/MarkupValueSemantics.java
index 7314aabbdf..a7cea3b81f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/MarkupValueSemantics.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/MarkupValueSemantics.java
@@ -99,8 +99,17 @@ implements
@Override
public Can<Markup> getExamples() {
return Can.of(
- Markup.valueOf("a Markup"),
- Markup.valueOf("another Markup"));
+ Markup.valueOf("<a href=\"https://isis.apache.org/\";>"
+ + "Link Name"
+ + "</a> is a link"),
+ Markup.valueOf("<h1>This is a Header</h1>"),
+ Markup.valueOf("<h2>This is a Medium Header</h2>"),
+ Markup.valueOf("<p>This is a new paragraph!</p>\n"
+ + "<p>\n"
+ + " <b>This is a new paragraph!</b> <br>\n"
+ + " <b><i>This is a new\n"
+ + " sentence without a paragraph break, in bold
italics.</i></b>\n"
+ + "</p>"));
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample1.html
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample1.html
deleted file mode 100644
index 20b5a47dae..0000000000
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample1.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ 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.
- ~
- -->
-
-<html>
-<body>
-
- <a href="https://isis.apache.org/";>Link Name</a> is a link
-
-</body>
-</html>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample2.html
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample2.html
deleted file mode 100644
index e9fc4a4c21..0000000000
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample2.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ 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.
- ~
- -->
-
-<html>
-<body>
-
- <h1>This is a Header</h1>
-
-</body>
-</html>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample3.html
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample3.html
deleted file mode 100644
index a5d5b09a3e..0000000000
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample3.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ~ 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.
- ~
- -->
-
-<html>
-<body>
- <h2>This is a Medium Header</h2>
-
-</body>
-</html>
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample4.html
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample4.html
deleted file mode 100644
index c1dc11e8f3..0000000000
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples-sample4.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ 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.
- ~
- -->
-
-<html>
-<body>
- <p>This is a new paragraph!</p>
- <p>
- <b>This is a new paragraph!</b> <br>
- <b><i>This is a new
- sentence without a paragraph break, in bold
italics.</i></b>
- </p>
-</body>
-</html>
